CRAFTERCMS-660
Fixed NPE caused by transaction scopes.
Merge pull request #184 from dejan-brkic/CRAFTERCMS-660

CRAFTERCMS-660