Added argument check