Really fix null pointer exception