Bug 868600 - Safeguard alarm check

IMO - safeguarding the alarm check is a more simple approach for the time being than resyncing the entire database.