Fix handling null values. Adding notifications.