diff --git a/VisualME7Logger/Form1.cs b/VisualME7Logger/Form1.cs
index 02fe949..ab15645 100644
--- a/VisualME7Logger/Form1.cs
+++ b/VisualME7Logger/Form1.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -459,7 +459,7 @@ void BuildChart()
                 SessionVariable var = session.Variables[graphVariable.Variable];
                 if (var != null)
                 {
-                    Series s = new Series(string.Format("{0} {1}-{2} {3}", graphVariable.Name, graphVariable.Min.ToString("0.##"), graphVariable.Max.ToString("0.##"), var.Unit));
+                    Series s = new Series(string.Format("{0} {1}-{2} {3}", String.IsNullOrEmpty(graphVariable.Name) ? graphVariable.Variable : graphVariable.Name, graphVariable.Min.ToString("0.##"), graphVariable.Max.ToString("0.##"), var.Unit));
                     s.Color = graphVariable.LineColor;
                     s.ChartType = (SeriesChartType)cmbChartType.SelectedItem;
                     s.BorderWidth = graphVariable.LineThickness;
@@ -570,7 +570,7 @@ void PlotLineOnChart(LogLine line)
                     decimal percent = (v.Value - graphVariable.Min) / (graphVariable.Max - graphVariable.Min) * this.DisplayOptions.GraphVRes;
                     DataPoint p = s.Points.Add((double)percent);
                     p.AxisLabel = decimal.Round(line.TimeStamp, 1).ToString();
-                    p.ToolTip = string.Format("{0}: {1} {2}\r\nMin: {3} {2}\r\nMax: {4} {2}", graphVariable.Name, v.Value, v.SessionVariable.Unit, v.CurrentMinValue, v.CurrentMaxValue);
+                    p.ToolTip = string.Format("{0}: {1} {2}\r\nMin: {3} {2}\r\nMax: {4} {2}", String.IsNullOrEmpty(graphVariable.Name) ? graphVariable.Variable : graphVariable.Name, v.Value, v.SessionVariable.Unit, v.CurrentMinValue, v.CurrentMaxValue);
                     p.Tag = v;
 
                     s.Points.RemoveAt(0);
@@ -765,7 +765,7 @@ void HighlightPoints(bool highlight = true)
                         if (v != null)
                         {
                             GraphVariable graphVar = this.DisplayOptions.GraphVariables.FirstOrDefault(gv => gv.Variable.Equals(v.SessionVariable.Name, StringComparison.InvariantCultureIgnoreCase));
-                            lowest.Label = string.Format("{0}: {1} {2}", graphVar != null ? graphVar.Name : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
+                            lowest.Label = string.Format("{0}: {1} {2}", graphVar != null ? (String.IsNullOrEmpty(graphVar.Name) ? graphVar.Variable : graphVar.Name) : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
                             lowest.LabelForeColor = Color.White;
                         }
                     }
@@ -776,7 +776,7 @@ void HighlightPoints(bool highlight = true)
                         if (v != null)
                         {
                             GraphVariable graphVar = this.DisplayOptions.GraphVariables.FirstOrDefault(gv => gv.Variable.Equals(v.SessionVariable.Name, StringComparison.InvariantCultureIgnoreCase));
-                            highest.Label = string.Format("{0}: {1} {2}", graphVar != null ? graphVar.Name : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
+                            highest.Label = string.Format("{0}: {1} {2}", graphVar != null ? (String.IsNullOrEmpty(graphVar.Name) ? graphVar.Variable : graphVar.Name) : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
                             highest.LabelForeColor = Color.White;
                         }
                     }
@@ -1219,4 +1219,4 @@ public override DataObject GetClipboardContent()
             return obj;
         }
     }
-}
\ No newline at end of file
+}