committed catch_quit improvements from last week after testing against Mongo and HBase code