Check for request conflicts during upgrade.
Fix build with gcc 4.2