Updated changes

Checking arguments, and updated try wait