Getting error "Cannot Load Photo" when trying to edit a photo with iCloud Photo Library enabled

I have iCloud Photo enabled. When I view a photo on my iPhone it downloads the photo and I can view it. If I choose to edit the photo I get error "Cannot Load Photo". Upon retrying numerous times I am able to edit the photo but at this point i get the error "There was an error saving this photo. Please try again later.". Photos becomes unresponsive and needs closed manually.

The photos this happens in mostly appear to be ones I have previously edited.

This happens on iOS 9.2 and 9.3 beta on an iPhone 6.

I'm also seeing some issues with some photos becoming all black.

Are there any ways to diagnose what is going wrong with iCloud Photo Library?

Thanks