Bugfix (problem if servant dtor throws)