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

CRAFTERCMS-660