Fixed null pointer