diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
index 46ccace4..371c8d27 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
@@ -298,9 +298,9 @@ protected Object readResolve() {
             } else {
                 rowHeaders = new SimpleRowHeader();
             }
-            if (buildCard == null) {
-                buildCard = new StandardBuildCard();
-            }
+        }
+        if (buildCard == null) {
+            buildCard = new StandardBuildCard();
         }
         return this;
     }
diff --git a/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java b/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java
index b6687af3..127948fb 100644
--- a/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java
+++ b/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java
@@ -222,6 +222,24 @@ public void testMigration() throws IOException {
         assertEquals(SimpleColumnHeader.class, testView.getColumnHeaders().getClass());
         assertNotNull(testView.getBuildCard());
         assertEquals(StandardBuildCard.class, testView.getBuildCard().getClass());
+
+        testView = new BuildPipelineView("My Build Pipeline Name",
+                "My Build Pipeline Title", new DownstreamProjectGridBuilder("Sample Project"),
+                "3", false, false,
+                false /* showPipelineParameters */,
+                false /* showPipelineParametersInHeaders */,
+                true /* showPipelineDefinitionHeader */,
+                3,
+                null,
+                null,
+                new SimpleColumnHeader(),
+                new SimpleRowHeader(),
+                null);
+        testView.readResolve();
+        assertNotNull(testView.getColumnHeaders());
+        assertEquals(SimpleColumnHeader.class, testView.getColumnHeaders().getClass());
+        assertNotNull(testView.getBuildCard());
+        assertEquals(StandardBuildCard.class, testView.getBuildCard().getClass());
     }
 
 	@Test