Null checks and broken tests.