Earlier commit to fix top-level bugs wrongly changed the context reported in case of errors