Merge "Adding a null check for a @NonNull arg"