Added none check to graph template