last commit caused a null pointer error.