redirect rather than blow up when things go wrong
Merge branch 'hotfix-0.8.9' into develop