Work on improved exception safety