WIP: use null instead of undefined for missing type check