Merge pull request #585 from apache/SCB-1011

SCB-1011 Added a NPE check in TransactionAspect