diff --git a/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java b/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java
index fdf20c2..940bdb9 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java
@@ -120,6 +120,10 @@ protected void createGoogleMapsDemo(String apiKey) {
               }
 
               if(withLabel.getValue()) {
+                if(labelText.getValue().isEmpty()) {
+                  Notification.show("Please select a label for the marker");
+                  return;
+                }
                 MarkerLabel label = new MarkerLabel(labelText.getValue());
                 label.setColor("white");
                 label.setFontWeight("bold");