Fixing stupid errors about implicitly returning NULL, by explicitly returning NULL