Fix issue with model termination in case of daemon actors
(e.g. ErrorHandlers shutting down too soon). This fix has also
been committed to passerelle@google.