Housekeeping and improved validation of notification before sending.