Null pointer fix 1.0