LUN-1300: Empty URL image handling - Small refactoring