Fixed Runtime null pointer
Fixed Runtime null pointer