Added check to see if the notifications should include a deadline, Fixed null reference bugs. Jake Haas