Merge "Revert "Fix the error and make the argument nonnull""