1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 5dfb8e83ed..0f3e634ed3 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -3250,7 +3250,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         public Column setHeaderCaption(String caption)
                 throws IllegalStateException {
             checkColumnIsAttached();
-
+            if (caption == null) {
+                caption = ""; // Render null as empty
+            }
             state.headerCaption = caption;
 
             HeaderRow row = grid.getHeader().getDefaultRow();