Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

contrib/babel/lisp/org-babel.el

@@ -494,7 +494,9 @@ may be specified in the properties of the current outline entry."
     (delq nil
           (mapcar
            (lambda (header-arg)
-             (let ((val (or (org-entry-get (point) header-arg 'selective)
+             (let ((val (or (condition-case nil
+                                (org-entry-get (point) header-arg 'selective)
+                              (error nil))
 			    (cdr (assoc header-arg org-file-properties)))))
                (when val
                  ;; (message "param-from-property %s=%s" header-arg val) ;; debugging statement