Fix bug where null values cause exceptions and alerts never get updated
CR: Alyssa