Fixing debug outline, added a null test