Prevent null pointer exception errors
Make graph output nicer