Checks before notification for OK status

[tmcdonald]

Since we have a bug/feature open on the tracker, I'll be closing this thread now, but feel free to open another if you need anything in the future!