Fix null pointer
Fix