add more error handling in instruments_client
Merge pull request #1464 from jlipps/master

add more error handling in instruments_client