Removed one last null pointer exception.