LUN-1300: Treat empty image URL in image crop - code clean-up