Better reporting of errors in Butler::prepare.