Use correct Nonnull annotation