Here is the "pull over mq patches" fix with the "abort" behaviour. Is it ok to use a hook to this ? the error message is a bit ugly but monkey patching solution are more fragile and far more tricky.