Fixes #5590: don't make enterprise client suicide itself
Merge pull request #514 from ncharles/bug_5590/dev/don_t_suicide_enterprise

Fixes #5590: don't make enterprise client suicide itself