Have a better stack-trace

Its still not perfect, but gives a lot less headache!