Also check null pointer
Do not skip first argument
Only use type spelling when needed