fixed up the null cases to be more descriptive