I think you are right - given the standard picture of a Klein Bottle, RP2 or torus as a square with identifications, one can "stretch the puncture" out to the boundary so that you have a graph. Thinking about a 3d analogue with a cube with sides identified, it would seem that you can make the...