Fixed null pointer shit