Re-add try/catch around saving but better