avoid attempting to delete pigeon image twice; NPE fix
javadocs