Make Transaction code more robust