Better check for arguments