Fixed some bugs, probably introduced other onews.  Also, any point we
grab a path, we need to ensure its not null before referencing it.