added some kind of exception handling
Merge branch 'master' of github.com:himerzi/addle