--- advice.el~	2012-11-13 22:00:19.237409000 +0000
+++ advice.el	2012-11-15 01:42:13.391473100 +0000
@@ -2599,3 +2599,3 @@
 	     ;; Construct the individual pieces that we need for assembly:
-	     (orig-arglist (ad-arglist origdef))
+	     (orig-arglist (and origdef (ad-arglist origdef)))
 	     (advised-arglist (or (ad-advised-arglist function)
--- nadvice.el~	2012-11-14 21:52:40.096113000 +0000
+++ nadvice.el	2012-11-15 01:42:13.391473100 +0000
@@ -131,3 +131,3 @@
   (let ((fspec (cadr (interactive-form function))))
-    (when (eq 'function (car fspec)) ;; Macroexpanded lambda?
+    (when (eq 'function (car-safe fspec)) ;; Macroexpanded lambda?
       (setq fspec (nth 1 fspec)))