Merge branch 'maint'

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index a7e4d1a..6eae5bb 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -101,7 +101,9 @@
 Set `sql-product' in Org edit buffer according to the
 corresponding :engine source block header argument."
   (let ((product (cdr (assq :engine (nth 2 info)))))
-    (sql-set-product product)))
+    (condition-case nil
+        (sql-set-product product)
+      (user-error "Cannot set `sql-product' in Org Src edit buffer"))))
 
 (defun org-babel-sql-dbstring-mysql (host port user password database)
   "Make MySQL cmd line args for database connection.  Pass nil to omit that arg."