Fixed a few null pointer derefs caused by dummy code that somehow I
forgot about.