Defensive termination

Defensive termination