SWC-701 Fixed bug that returns null
Merge pull request #473 from heidiso/develop

SWC-701 Fixed bug that returns null