Added additional argument check.