@@ -9,9 +9,31 @@
 using namespace v8;
 using namespace node;
 
-struct CallbackWrapper {
+class CallbackWrapper {
   Nan::Callback* jsCallback;
-  void * payload;
+
+public:
+  CallbackWrapper() {
+    jsCallback = NULL;
+  }
+  ~CallbackWrapper() {
+    SetCallback(NULL);
+  }
+
+  bool HasCallback() {
+    return jsCallback != NULL;
+  }
+
+  Nan::Callback* GetCallback() {
+    return jsCallback;
+  }
+
+  void SetCallback(Nan::Callback* callback) {
+    if(jsCallback) {
+      delete jsCallback;
+    }
+    jsCallback = callback;
+  }
 };
 
 #endif
@@ -11,8 +11,8 @@
         info.GetReturnValue().Set(Nan::New(wrapper->{{ field.name }}));
 
       {% elsif field.isCallbackFunction %}
-        if (wrapper->{{field.name}} != NULL) {
-          info.GetReturnValue().Set(wrapper->{{ field.name }}->GetFunction());
+        if (wrapper->{{field.name}}.HasCallback()) {
+          info.GetReturnValue().Set(wrapper->{{ field.name }}.GetCallback()->GetFunction());
         } else {
           info.GetReturnValue().SetUndefined();
         }
@@ -47,16 +47,12 @@
         wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}{% if field.cppClassName == 'GitStrarray' %}StrArrayConverter::Convert({{ field.name }}->ToObject()){% else %}Nan::ObjectWrap::Unwrap<{{ field.cppClassName }}>({{ field.name }}->ToObject())->GetValue(){% endif %};
 
       {% elsif field.isCallbackFunction %}
-        if (wrapper->{{ field.name }} != NULL) {
-          delete wrapper->{{ field.name }};
-        }
-
         if (value->IsFunction()) {
           if (!wrapper->raw->{{ field.name }}) {
             wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;
           }
 
-          wrapper->{{ field.name }} = new Nan::Callback(value.As<Function>());
+          wrapper->{{ field.name }}.SetCallback(new Nan::Callback(value.As<Function>()));
         }
 
       {% elsif field.payloadFor %}
@@ -105,7 +101,7 @@
           {% if arg.payload == true %}{{arg.name}}{% elsif arg.lastArg %}{{arg.name}}{% endif %}
         {% endeach %});
 
-        if (instance->{{ field.name }}->IsEmpty()) {
+        if (instance->{{ field.name }}.GetCallback()->IsEmpty()) {
           {% if field.return.type == "int" %}
             baton->result = baton->defaultResult; // no results acquired
           {% endif %}
@@ -149,7 +145,7 @@
         };
 
         Nan::TryCatch tryCatch;
-        Local<v8::Value> result = instance->{{ field.name }}->Call({{ field.args|jsArgsCount }}, argv);
+        Local<v8::Value> result = instance->{{ field.name }}.GetCallback()->Call({{ field.args|jsArgsCount }}, argv);
 
         uv_close((uv_handle_t*) &baton->req, NULL);
 
 
@@ -52,10 +52,7 @@ using namespace std;
     {% if not field.ignore %}
       {% if not field.isEnum %}
         {% if field.isCallbackFunction %}
-  if (this->{{ field.name }} != NULL) {
-    delete this->{{ field.name }};
     this->raw->{{ fields|payloadFor field.name }} = NULL;
-  }
         {% endif %}
       {% endif %}
     {% endif %}
@@ -83,7 +80,6 @@ void {{ cppClassName }}::ConstructFields() {
           // the current instance
           this->raw->{{ field.name }} = NULL;
           this->raw->{{ fields|payloadFor field.name }} = (void *)this;
-          this->{{ field.name }} = NULL;
         {% elsif field.payloadFor %}
 
           Local<Value> {{ field.name }} = Nan::Undefined();
 
@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "async_baton.h"
+#include "callback_wrapper.h"
 
 extern "C" {
   #include <git2.h>
@@ -75,7 +76,7 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
           {% if field.isLibgitType %}
             Nan::Persistent<Object> {{ field.name }};
           {% elsif field.isCallbackFunction %}
-            Nan::Callback* {{ field.name }};
+            CallbackWrapper {{ field.name }};
           {% elsif field.payloadFor %}
             Nan::Persistent<Value> {{ field.name }};
           {% endif %}