Bug 850850 - Add additional safe gaurds to ensure alarms fire