Fixed moronic null-pointer stuff.