diff --git a/src/Qwack.Core/Cubes/ResultCube.cs b/src/Qwack.Core/Cubes/ResultCube.cs
index ce3aab08..90376d93 100644
--- a/src/Qwack.Core/Cubes/ResultCube.cs
+++ b/src/Qwack.Core/Cubes/ResultCube.cs
@@ -65,7 +65,7 @@ public ResultCube(TO_ResultCube transportObject)
             _fieldNames = transportObject.FieldNames;
             _types = transportObject.Types.ToDictionary(x => x.Key, x => Type.GetType(x.Value));
             var types = _fieldNames.Select(x => _types[x]).ToArray();
-            _rows = transportObject.Rows.Select(x => new ResultCubeRow(x, types)).ToList();
+            _rows = transportObject.Rows?.Select(x => new ResultCubeRow(x, types)).ToList() ?? new List<ResultCubeRow>();
         }
 
         public void Initialize(Dictionary<string, Type> dataTypes)
diff --git a/src/Qwack.Core/Curves/EquityPriceCurve.cs b/src/Qwack.Core/Curves/EquityPriceCurve.cs
index d809296f..7a8bc7fb 100644
--- a/src/Qwack.Core/Curves/EquityPriceCurve.cs
+++ b/src/Qwack.Core/Curves/EquityPriceCurve.cs
@@ -85,7 +85,7 @@ public EquityPriceCurve(DateTime buildDate, double spot, string ccy, IIrCurve ir
         }
 
         public EquityPriceCurve(TO_EquityPriceCurve to, IFundingModel fundingModel, ICurrencyProvider currencyProvider)
-            : this(to.BuildDate, to.Spot, to.Currency, fundingModel.GetCurve(to.Currency), to.SpotDate, to.PillarDates, to.DivYields, to.DiscreteDivDates,
+            : this(to.BuildDate, to.Spot, to.Currency, fundingModel?.GetCurve(to.Currency), to.SpotDate, to.PillarDates, to.DivYields, to.DiscreteDivDates,
                   to.DiscreteDivs, currencyProvider, to.Basis, to.PillarLabels)
         {
             AssetId = to.AssetId;
diff --git a/src/Qwack.Core/Curves/PriceCurveFactory.cs b/src/Qwack.Core/Curves/PriceCurveFactory.cs
index ae00fb9b..105cd414 100644
--- a/src/Qwack.Core/Curves/PriceCurveFactory.cs
+++ b/src/Qwack.Core/Curves/PriceCurveFactory.cs
@@ -29,6 +29,8 @@ public static IPriceCurve GetPriceCurve(this TO_PriceCurve transportObject, ICur
             if (transportObject.ContangoPriceCurve != null)
                 return new ContangoPriceCurve(transportObject.ContangoPriceCurve, currencyProvider);
 
+            if (transportObject.EquityPriceCurve != null)
+                return new EquityPriceCurve(transportObject.EquityPriceCurve, null, currencyProvider);
 
             throw new Exception("Unable to build price curve");
         }
diff --git a/version.props b/version.props
index ff7c929f..7e42f6c3 100644
--- a/version.props
+++ b/version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>0.8.0</VersionPrefix>
+        <VersionPrefix>0.8.01</VersionPrefix>
     </PropertyGroup>
 </Project>
diff --git a/version.txt b/version.txt
index a3df0a69..6edd1dd1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.8.0
+0.8.01