transaction might be null
Merge pull request #155 from SMB-TEC/master

transaction might be null