update error message parsing & include ids in call