Fixed error with the argument null pointer stuff