KRACOEUS-7718: fixing NPE
KRACOEUS-7718: fixing save exception, fixing commons-lang import
Merge pull request #540 from leoherbie/KRACOEUS-7718

Kracoeus 7718