diff --git a/integration/regtest.js b/integration/regtest.js
index 475e1765..7b632746 100644
--- a/integration/regtest.js
+++ b/integration/regtest.js
@@ -21,6 +21,7 @@ var should = chai.should();
 var assert = chai.assert;
 var sinon = require('sinon');
 var BitcoinRPC = require('bitcoind-rpc');
+var transactionData = [];
 var blockHashes = [];
 var utxo;
 var client;
@@ -123,6 +124,10 @@ describe('Daemon Binding Functionality', function() {
                 var unspentTransaction = bitcore.Transaction();
                 var outputIndex;
                 unspentTransaction.fromString(response.result.hex);
+
+                // add to the list of transactions for testing later
+                transactionData.push(response.result.hex);
+
                 for (var i = 0; i < unspentTransaction.outputs.length; i++) {
                   var output = unspentTransaction.outputs[i];
                   if (output.script.toAddress(network).toString() === address.toString(network)) {
@@ -181,7 +186,7 @@ describe('Daemon Binding Functionality', function() {
 
   describe('get blocks by height', function() {
 
-    [0,1,2,3,5,6,7,8,9].forEach(function(i) {
+    [0,1,2,3,4,5,6,7,8,9].forEach(function(i) {
       it('generated block ' + i, function(done) {
         // add the genesis block
         var height = i + 1;
@@ -198,6 +203,35 @@ describe('Daemon Binding Functionality', function() {
     });
   });
 
+  describe('get transactions by hash', function() {
+    [0].forEach(function(i) {
+      it('for tx ' + i, function(done) {
+        var txhex = transactionData[i];
+        var tx = new bitcore.Transaction();
+        tx.fromString(txhex);
+        bitcoind.getTransaction(tx.hash, true, function(err, response) {
+          if (err) {
+            throw err;
+          }
+          assert(response.toString('hex') === txhex, 'incorrect tx data result');
+          done();
+        });
+      });
+    });
+
+    it('will return null if the transaction does not exist', function(done) {
+      var txid = '6226c407d0e9705bdd7158e60983e37d0f5d23529086d6672b07d9238d5aa618';
+      bitcoind.getTransaction(txid, true, function(err, response) {
+        if (err) {
+          throw err;
+        }
+        should.not.exist(response);
+        done();
+      });
+    });
+
+  });
+
   describe('get block index', function() {
     var expectedWork = new BN(6);
     [1,2,3,4,5,6,7,8,9].forEach(function(i) {
diff --git a/src/libbitcoind.cc b/src/libbitcoind.cc
index ae21910c..c243c763 100644
--- a/src/libbitcoind.cc
+++ b/src/libbitcoind.cc
@@ -1135,15 +1135,19 @@ async_get_tx_after(uv_work_t *req) {
     }
   } else {
 
-    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
-    ssTx << ctx;
-    std::string stx = ssTx.str();
-    Local<Value> rawNodeBuffer = node::Buffer::New(isolate, stx.c_str(), stx.size());
+    Local<Value> result = Local<Value>::New(isolate, NanNull());
+
+    if (!ctx.IsNull()) {
+      CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+      ssTx << ctx;
+      std::string stx = ssTx.str();
+      result = node::Buffer::New(isolate, stx.c_str(), stx.size());
+    }
 
     const unsigned argc = 2;
     Local<Value> argv[argc] = {
       Local<Value>::New(isolate, NanNull()),
-      rawNodeBuffer
+      result
     };
     TryCatch try_catch;
     cb->Call(isolate->GetCurrentContext()->Global(), argc, argv);