hack to prevent runtime error
Merge branch 'except_runtimeerror' into develop
Merge branch 'develop'