- Fixed null pointer error