Remove isolation, catch rehash errors

@steved555 @zendesk/operations