Cleaned up argument check