diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31089c997..718154bc5 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-26  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-insert-link): Improve error message when there is no
+	default link to select with RET.
+
 	* org-agenda.el (org-agenda-filter-by-tag): Use char argument from
 	parameter list.
 
diff --git a/lisp/org.el b/lisp/org.el
index 89fb3ebb8..6e18ecd89 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7926,6 +7926,8 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
 		     nil nil nil
 		     'tmphist
 		     (car (car org-stored-links)))))
+	    (if (not (string-match "\\S-" link))
+		(error "No link selected"))
 	    (if (or (member link all-prefixes)
 		    (and (equal ":" (substring link -1))
 			 (member (substring link 0 -1) all-prefixes)