Added checks to prevent an error that occurred after editing a feature with photos