Fixed various stacktraces, including issue #55
Merge pull request #56 from bstascavage/master

Fixed various stacktraces, including issue #55