Fix resolving of 'null'