Have a better stack-trace

Its still not perfect, but gives a lot less headache!
Merge pull request #28 from SimonDanisch/patch-4

Have a better stack-trace