Added catching for arguments