smoother error recovery in init
Merge pull request #1680 from WalterBright/b50

smoother error recovery in init