updated error handling for commissioning