diff --git a/generate/templates/filters/args_info.js b/generate/templates/filters/args_info.js
index e2fe799d7..1382c67d6 100644
--- a/generate/templates/filters/args_info.js
+++ b/generate/templates/filters/args_info.js
@@ -22,6 +22,7 @@ module.exports = function(args) {
 
     arg.cArg = cArg;
     arg.isCppClassStringOrArray = ~["String", "Array"].indexOf(arg.cppClassName);
+    arg.isConst = ~arg.cType.indexOf("const ");
 
     // if we have a callback then we also need the corresponding payload for that callback
     if (arg.isCallbackFunction) {
diff --git a/generate/templates/partials/async_function.cc b/generate/templates/partials/async_function.cc
index c38066b99..7b564adb2 100644
--- a/generate/templates/partials/async_function.cc
+++ b/generate/templates/partials/async_function.cc
@@ -250,7 +250,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
     {%if arg.isCppClassStringOrArray %}
       {%if arg.freeFunctionName %}
   {{ arg.freeFunctionName }}(baton->{{ arg.name }});
-      {%else%}
+      {%elsif not arg.isConst%}
   free((void *)baton->{{ arg.name }});
       {%endif%}
     {%elsif arg | isOid %}
diff --git a/test/tests/branch.js b/test/tests/branch.js
index cdb57a804..8e69020a8 100644
--- a/test/tests/branch.js
+++ b/test/tests/branch.js
@@ -68,4 +68,13 @@ describe("Branch", function() {
         assert.equal(upstream.shorthand(), upstreamName);
       });
   });
+
+  it("can get the name of a branch", function() {
+    var branch = this.branch;
+
+    return NodeGit.Branch.name(branch)
+      .then(function(branchNameToTest) {
+        assert.equal(branchNameToTest, branchName);
+      });
+  });
 });