Don't try to return to base if already dead

This might fix #2503.