Remove a null check producing an unwanted defaultObject return