LUN-1300: Empty URL image handling - Small refactoring
Merge pull request #9 from pbs/LUN-1300

LUN-1300: Empty URL image handling - Small refactoring