bugfix: exception handling, syntax error
Merge branch 'release/0.0.4'