diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/ProgramResult.java b/ethereumj-core/src/main/java/org/ethereum/vm/ProgramResult.java
index 76d98b18..fcfa4e8d 100644
--- a/ethereumj-core/src/main/java/org/ethereum/vm/ProgramResult.java
+++ b/ethereumj-core/src/main/java/org/ethereum/vm/ProgramResult.java
@@ -43,6 +43,8 @@ public class ProgramResult {
     }
 
     public ByteBuffer getHReturn() {
+        if (hReturn == null)
+           this.setHReturn(new byte[] {});
         return hReturn;
     }
 
diff --git a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java
index 0af27485..2e524eac 100644
--- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java
+++ b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java
@@ -44,7 +44,6 @@ public class GitHubStateTest {
     public void stInitCodeTest() throws ParseException { // [V]
 
         Set<String> excluded = new HashSet<>();
-        excluded.add("CallContractToCreateContractWhichWouldCreateContractInInitCode");
 
         String json = JSONReader.loadJSON("StateTests/stInitCodeTest.json");
         GitHubJSONTestSuite.runGitHubJsonStateTest(json, excluded);