Prevent recursive exceptions
code review fixes
Merge pull request #542 from nlake44/recursive

Prevent recursive exceptions