Added error flow. Maybe. Conversion class might be misbehaving right now so can't test