SERVER-11178 remove catalog hack
SERVER-10026 don't toString a query unless there's an error