Handle None case in onWhatever handlers