fix for errorhandling on paymentplan
Merge branch 'hotfix/2.0.17'