Fixed null pointer - for real this time.