Add nil-guards to the graphs

Benjamin Mako Hill || Want to submit a patch?