Add conditions for simpleError-type calls