exceptions should make the build unstable as well
Merge branch 'v0.8.x_bugfix'