Merge "Bug 508: Improved error reporting for failed canCommit phase."