A couple more explicit not-null checks