diff --git a/libbindgen/src/clang.rs b/libbindgen/src/clang.rs
index 637823ead8..6c95b22f3c 100644
--- a/libbindgen/src/clang.rs
+++ b/libbindgen/src/clang.rs
@@ -420,16 +420,26 @@ impl Cursor {
 
     /// Given that this cursor's referent is a function, return cursors to its
     /// parameters.
-    pub fn args(&self) -> Vec<Cursor> {
+    pub fn args(&self) -> Option<Vec<Cursor>> {
+        // XXX: We might want to use and keep num_args
+        // match self.kind() {
+        // CXCursor_FunctionDecl |
+        // CXCursor_CXXMethod => {
         unsafe {
-            let num = self.num_args().expect("expected value, got none") as u32;
-            let mut args = vec![];
-            for i in 0..num {
-                args.push(Cursor {
-                    x: clang_Cursor_getArgument(self.x, i as c_uint),
-                });
+            let w = clang_Cursor_getNumArguments(self.x);
+            if w == -1 {
+                None
+            } else {
+                let num = w as u32;
+
+                let mut args = vec![];
+                for i in 0..num {
+                    args.push(Cursor {
+                        x: clang_Cursor_getArgument(self.x, i as c_uint),
+                    });
+                }
+                Some(args)
             }
-            args
         }
     }
 
diff --git a/libbindgen/src/ir/function.rs b/libbindgen/src/ir/function.rs
index eacb6c0ea8..60bd1e5b75 100644
--- a/libbindgen/src/ir/function.rs
+++ b/libbindgen/src/ir/function.rs
@@ -150,7 +150,7 @@ impl FunctionSig {
             CXCursor_CXXMethod => {
                 // For CXCursor_FunctionDecl, cursor.args() is the reliable way
                 // to get parameter names and types.
-                cursor.args()
+                cursor.args().expect("It cannot be None because we are in a method/function")
                     .iter()
                     .map(|arg| {
                         let arg_ty = arg.cur_type();
diff --git a/libbindgen/tests/expectations/tests/variadic_template_function.rs b/libbindgen/tests/expectations/tests/variadic_template_function.rs
new file mode 100644
index 0000000000..cd99df960d
--- /dev/null
+++ b/libbindgen/tests/expectations/tests/variadic_template_function.rs
@@ -0,0 +1,12 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct VariadicFunctionObject<T> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+}
diff --git a/libbindgen/tests/headers/variadic_template_function.hpp b/libbindgen/tests/headers/variadic_template_function.hpp
new file mode 100644
index 0000000000..4942d8f024
--- /dev/null
+++ b/libbindgen/tests/headers/variadic_template_function.hpp
@@ -0,0 +1,6 @@
+
+template <typename T>
+class VariadicFunctionObject {
+public:
+	int add_em_up(T count,...);
+};