raise exception again if calculate fails
Merge branch 'master' into stable