Now we will at least get an error message when an Exception occurs
instead of silently killing the thread.
[Forgot to add all files to commit]