Changed add and remove to check for a null node instead of null.  Some
thing was changed so that null node is returned.