Added check for null argument #1