Bug 850850 - Add additional safe gaurds to ensure alarms fire
Merge pull request #9825 from lightsofapollo/alarms-hotfix

Bug 850850 - Add additional safe gaurds to ensure alarms fire r=kgrandon