Fix Null pointer