Fix null pointer attempt 2