diff --git a/.vs/SpecFlowNullReference/v15/Server/sqlite3/db.lock b/.vs/SpecFlowNullReference/v15/Server/sqlite3/db.lock
new file mode 100644
index 0000000..e69de29
diff --git a/.vs/SpecFlowNullReference/v15/Server/sqlite3/storage.ide b/.vs/SpecFlowNullReference/v15/Server/sqlite3/storage.ide
new file mode 100644
index 0000000..014d4cc
Binary files /dev/null and b/.vs/SpecFlowNullReference/v15/Server/sqlite3/storage.ide differ
diff --git a/SpecFlowNullReference/NullReferenceSteps.cs b/SpecFlowNullReference/NullReferenceSteps.cs
index ee1480d..39945a0 100644
--- a/SpecFlowNullReference/NullReferenceSteps.cs
+++ b/SpecFlowNullReference/NullReferenceSteps.cs
@@ -7,18 +7,27 @@ namespace SpecFlowNullReference
     public class NullReferenceSteps
     {
         private const string Key = "SomeKey";
+        private const string IsNullKey = Key + "isNull";
         private object value;
 
         [Given(@"I set null value to ScenarioContext")]
         public void GivenISetNullValueToScenarioContext()
         {
-            ScenarioContext.Current.Set<object>(null, Key);
+            string theValue = null;
+            ScenarioContext.Current.Set<object>(theValue, Key);
+            ScenarioContext.Current.Set<object>(theValue==null, IsNullKey);
         }
 
         [When(@"I get value from ScenarioContext")]
         public void WhenIGetValueFromScenarioContext()
         {
-            value = ScenarioContext.Current.Get<object>(Key);
+            var keyIsnull = ScenarioContext.Current.Get<bool>(IsNullKey);
+
+            if (keyIsnull)
+                value = null;
+            else 
+                value = ScenarioContext.Current.Get<object>(Key);
+            
         }
 
         [Then(@"the value should be null")]