KFSTP-1466 use cleanAmount in calculations to avoid NPEs
Merge pull request #40 from smith750/KFSTP1466

KFSTP-1466 use cleanAmount in calculations to avoid NPEs