try making error compatible with master