Add 'null' and start default function handling