Backporting from trunk. r1626450
[OFBIZ-5511] Thanks for reporting the issue Christian Carlow and Deepak Dixit for the fix. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1626451 13f79535-47bb-0310-9956-ffa450edef68