more fixes for null images