changed name; added error handling to 2 commands