* fixed null pointer error