fix #197
Merge remote-tracking branch 'Kotti/master' into feature/dragndrop_ordering

# By Andreas kaiser
# Via Andreas kaiser
* Kotti/master:
  fix #197
Fix the tests.
Only catch specific exceptions.