Fixed first null pointer