Merge "Bug 572780 - Updating a comparison raises a NullPointerException"