DDF-533 added check to make sure notification is not null in
removeNotification function