diff --git a/releases/JavaFXSmartGraph-0.9.jar b/releases/JavaFXSmartGraph-0.9.jar
index 592196d..174b762 100644
Binary files a/releases/JavaFXSmartGraph-0.9.jar and b/releases/JavaFXSmartGraph-0.9.jar differ
diff --git a/releases/JavaFXSmartGraph-0.9.zip b/releases/JavaFXSmartGraph-0.9.zip
index cd1fea0..6313da0 100644
Binary files a/releases/JavaFXSmartGraph-0.9.zip and b/releases/JavaFXSmartGraph-0.9.zip differ
diff --git a/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java b/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java
index dfd55de..1cfed15 100644
--- a/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java
+++ b/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java
@@ -679,7 +679,7 @@ private void updateLabels() {
             if (vertexNode != null) {
                 SmartLabel label = vertexNode.getAttachedLabel();
                 if(label != null) {
-                    label.setText(v.element().toString());
+                    label.setText(v.element() != null ? v.element().toString() : "<NULL>");
                 }
                 
             }
@@ -690,7 +690,7 @@ private void updateLabels() {
             if (edgeNode != null) {
                 SmartLabel label = edgeNode.getAttachedLabel();
                 if (label != null) {
-                    label.setText(e.element().toString());
+                    label.setText(e.element() != null ? e.element().toString() : "<NULL>");
                 }
             }
         });