Refactored image_fu helper to only use geometry when not nil.
Merge pull request #2810 from refinery/refactored-image-fu-to-prevent-bugs

Refactored image_fu helper to only use geometry when not nil.