Merging in KRACOEUS-6905 to resolve stack trace.
Merge pull request #14 from blackcathacker/rsmart-5.1.1-BS

Merging in KRACOEUS-6905 to resolve stack trace.