Remove a few unneeded NULL cheks - thx XhmikosR :)