tern: fix MOR exception catching
Merge remote-tracking branch 'origin/staging' into staging