cleaning up exception throwing, so desired messages get passed to
callers.

Also changing the timeout values on remote service connect and query.