Porting development branch fix for getting images that don't exist