diff --git a/ApplicationCode/FileInterface/RifRsmspecParserTools.cpp b/ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
index c7cd76d225..aacf52171a 100644
--- a/ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
+++ b/ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
@@ -270,6 +270,12 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
     std::vector<RifEclipseSummaryAddress::SummaryVarCategory> categories;
     size_t columnCount = quantityNames.size();
 
+    if (unitNames.size() != columnCount)
+    {
+        size_t diff = columnCount - unitNames.size();
+        unitNames.insert(unitNames.end(), diff, "");
+    }
+
     for (std::string unit : unitNames)
     {
         ColumnInfo columnInfo;
diff --git a/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp b/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
index ac75997f7f..3fb0f05367 100644
--- a/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
+++ b/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
@@ -246,7 +246,7 @@ TEST(RifRsmspecParserToolsTest, TestSplitLineToDoubles)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-TEST(RifColumnBasedRsmspecParserTest, TestKeywords)
+TEST(RifColumnBasedRsmspecParserTest, TestKeywordsAndMissingUnitName)
 {
 
     QString data;
@@ -258,7 +258,7 @@ TEST(RifColumnBasedRsmspecParserTest, TestKeywords)
     out << "DATEFORMAT        DD/MM/YY\n";
     out << "\n";
     out << "TIME    YEARX    WGT1    WGT2    WGT4    WR12    WR22    WR42    \n";
-    out << "DAYS    YEARS    kg/Sm3    kg/Sm3    kg/Sm3    kg/Sm3    kg/Sm3    kg/Sm3    \n";
+    out << "DAYS    YEARS    kg/Sm3    kg/Sm3    kg/Sm3    kg/Sm3    kg/Sm3        \n";
     out << "1    1    1.00E+03    1.00E+03    1.00E+03    1.00E+03    1.00E+03    1.00E+03    \n";
     out << "        OP-1    OP-1    OP-1    OP-1    OP-1    OP-1    \n";
     out << "\n";
@@ -299,6 +299,8 @@ TEST(RifColumnBasedRsmspecParserTest, TestKeywords)
     EXPECT_EQ("OP-2_TR", tables[1].at(0).origin);
     EXPECT_EQ("DD/MM/YY", tables[1].at(0).dateFormat);
 
+    EXPECT_EQ("", tables[0].at(7).unitName);
+
     ASSERT_EQ(8, tables.at(0).size());
     EXPECT_EQ(1.0E-12, tables.at(0).at(4).values[0]);
 }