[queso]: several edits to the src files, to support exception handling test