add more error handling in instruments_client