Restore commented out exception mappers, update for siesta 2.x api usage