add try/catch around mapper
better status