Better terminate/reload behavior