diff --git a/ext/byte_buffer.cc b/ext/byte_buffer.cc
index 5235c8e0..82b54b51 100644
--- a/ext/byte_buffer.cc
+++ b/ext/byte_buffer.cc
@@ -65,7 +65,7 @@ grpc_byte_buffer *BufferToByteBuffer(Handle<Value> buffer) {
 Handle<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
   NanEscapableScope();
   if (buffer == NULL) {
-    return NanNull();
+    return NanEscapeScope(NanNull());
   }
   size_t length = grpc_byte_buffer_length(buffer);
   char *result = reinterpret_cast<char *>(calloc(length, sizeof(char)));
diff --git a/ext/completion_queue_async_worker.cc b/ext/completion_queue_async_worker.cc
index ca22527e..cd7acd1d 100644
--- a/ext/completion_queue_async_worker.cc
+++ b/ext/completion_queue_async_worker.cc
@@ -80,7 +80,6 @@ void CompletionQueueAsyncWorker::HandleOKCallback() {
   NanScope();
   NanCallback *callback = GetTagCallback(result->tag);
   Handle<Value> argv[] = {NanNull(), GetTagNodeValue(result->tag)};
-
   callback->Call(2, argv);
 
   DestroyTag(result->tag);
diff --git a/test/math_client_test.js b/test/math_client_test.js
index b9155fdf..d83f6411 100644
--- a/test/math_client_test.js
+++ b/test/math_client_test.js
@@ -81,7 +81,7 @@ describe('Math client', function() {
       done();
     });
   });
-  it.only('should handle a client streaming request', function(done) {
+  it('should handle a client streaming request', function(done) {
     var call = math_client.sum(function handleSumResult(err, value) {
       assert.ifError(err);
       assert.equal(value.num, 21);