Minor fixes

lisp/org-id.el

@@ -437,12 +437,14 @@ When CHECK is given, prepare detailed information about duplicate IDs."
 		  (if (member id found)
 		      (progn
 			(message "Duplicate ID \"%s\", also in file %s"
-				 id (car (delq
-					  nil
-					  (mapcar
-					   (lambda (x)
-					     (if (member id (cdr x)) (car x)))
-					   reg))))
+				 id (or (car (delq
+					      nil
+					      (mapcar
+					       (lambda (x)
+						 (if (member id (cdr x))
+						     (car x)))
+					       reg)))
+					(buffer-file-name)))
 			(when (= ndup 0)
 			  (ding)
 			  (sit-for 2))

lisp/org-mobile.el

@@ -624,7 +624,7 @@ If BEG and END are given, only do this in that region."
 		 (not (member (marker-buffer id-pos) buf-list)))
 	(org-mobile-timestamp-buffer (marker-buffer id-pos))
 	(push (marker-buffer id-pos) buf-list))
-				     
+
       (if (or (not id-pos) (stringp id-pos))
 	  (progn
 	    (goto-char (+ 2 (point-at-bol)))