diff --git a/ethereumj-core/src/main/java/org/ethereum/core/Transaction.java b/ethereumj-core/src/main/java/org/ethereum/core/Transaction.java
index f7aa0e4e..c1730a0e 100644
--- a/ethereumj-core/src/main/java/org/ethereum/core/Transaction.java
+++ b/ethereumj-core/src/main/java/org/ethereum/core/Transaction.java
@@ -175,7 +175,7 @@ public class Transaction {
     }
 
     public boolean isContractCreation() {
-        return Arrays.equals(this.receiveAddress, ByteUtil.EMPTY_BYTE_ARRAY);
+        return this.receiveAddress == null;
     }
 
     /*********
diff --git a/ethereumj-core/src/main/java/org/ethereum/core/Wallet.java b/ethereumj-core/src/main/java/org/ethereum/core/Wallet.java
index 0cbbf3e6..1d36572e 100644
--- a/ethereumj-core/src/main/java/org/ethereum/core/Wallet.java
+++ b/ethereumj-core/src/main/java/org/ethereum/core/Wallet.java
@@ -170,14 +170,16 @@ public class Wallet {
         }
 
         byte[] receiveAddress = transaction.getReceiveAddress();
-        Account receiver =  rows.get(Hex.toHexString(receiveAddress));
-        if (receiver != null) {
-            receiver.addPendingTransaction(transaction);
-
-            logger.info("Pending transaction added to " +
-                            "\n account: [{}], " +
-                            "\n tx: [{}]",
-                    Hex.toHexString(receiver.getAddress()), Hex.toHexString(transaction.getHash()));
+        if(receiveAddress != null) {
+	        Account receiver =  rows.get(Hex.toHexString(receiveAddress));
+	        if (receiver != null) {
+	            receiver.addPendingTransaction(transaction);
+	
+	            logger.info("Pending transaction added to " +
+	                            "\n account: [{}], " +
+	                            "\n tx: [{}]",
+	                    Hex.toHexString(receiver.getAddress()), Hex.toHexString(transaction.getHash()));
+	        }
         }
         this.notifyListeners();
     }