Improved error handling during transaction hasConflict checking

Change-Id: I990460d321bfd89c71cdfd76783b2b6c0768dbf0