more cleaning up
reimplemented exception handling
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from codeanticode/master

handle exceptions outside animator loop