Image null handling implemented