51558369 better error management