fix to catch properly in Client for Query errors