Index: semantic/semantic-decorate-mode.el
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/semantic-decorate-mode.el,v
retrieving revision 1.26
diff -u -w -b -B -r1.26 semantic-decorate-mode.el
--- semantic/semantic-decorate-mode.el	7 Sep 2008 11:19:10 -0000	1.26
+++ semantic/semantic-decorate-mode.el	16 Oct 2008 14:22:48 -0000
@@ -264,6 +264,8 @@
 The minor mode can be turned on only if the semantic feature is available
 and the current buffer was set up for parsing.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if semantic-decoration-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
           (progn
@@ -293,6 +295,7 @@
                  'semantic-decorate-tags-after-full-reparse t)
     )
   semantic-decoration-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun semantic-decoration-mode (&optional arg)
Index: semantic/semantic-idle.el
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/semantic-idle.el,v
retrieving revision 1.51
diff -u -w -b -B -r1.51 semantic-idle.el
--- semantic/semantic-idle.el	7 Sep 2008 14:16:02 -0000	1.51
+++ semantic/semantic-idle.el	16 Oct 2008 14:22:48 -0000
@@ -168,6 +168,8 @@
 and the current buffer was set up for parsing.  When minor mode is
 enabled parse the current buffer if needed.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if semantic-idle-scheduler-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
           (progn
@@ -177,6 +179,7 @@
                    (buffer-name)))
         (semantic-idle-scheduler-setup-timers)))
   semantic-idle-scheduler-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun semantic-idle-scheduler-mode (&optional arg)
@@ -646,6 +649,8 @@
 The minor mode can be turned on only if semantic feature is available
 and the idle scheduler is active.
 Return non-nil if the minor mode is enabled.")
+				 (condition-case nil
+						 (progn
 	 (if ,mode
 	     (if (not (and (featurep 'semantic) (semantic-active-p)))
 		 (progn
@@ -660,6 +665,7 @@
 	   (semantic-idle-scheduler-remove #',func)
 	   )
 	 ,mode)
+					 (error nil)))
 
 ;;;###autoload
        (defun ,mode (&optional arg)
Index: semantic/semantic-mru-bookmark.el
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/semantic-mru-bookmark.el,v
retrieving revision 1.15
diff -u -w -b -B -r1.15 semantic-mru-bookmark.el
--- semantic/semantic-mru-bookmark.el	10 Oct 2008 21:37:55 -0000	1.15
+++ semantic/semantic-mru-bookmark.el	16 Oct 2008 14:22:48 -0000
@@ -272,6 +272,8 @@
 and the current buffer was set up for parsing.  When minor mode is
 enabled parse the current buffer if needed.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if semantic-mru-bookmark-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
 	  (progn
@@ -292,6 +294,7 @@
 		 'semantic-mru-bookmark-change-hook-fcn t)
     )
   semantic-mru-bookmark-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun semantic-mru-bookmark-mode (&optional arg)
Index: semantic/semantic-util-modes.el
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/semantic-util-modes.el,v
retrieving revision 1.61
diff -u -w -b -B -r1.61 semantic-util-modes.el
--- semantic/semantic-util-modes.el	19 Jun 2008 02:24:21 -0000	1.61
+++ semantic/semantic-util-modes.el	16 Oct 2008 14:22:48 -0000
@@ -255,6 +255,8 @@
 and the current buffer was set up for parsing.  When minor mode is
 enabled parse the current buffer if needed.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if semantic-highlight-edits-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
           (progn
@@ -271,6 +273,7 @@
 		 'semantic-highlight-edits-new-change-hook-fcn t)
     )
   semantic-highlight-edits-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun semantic-highlight-edits-mode (&optional arg)
@@ -450,6 +453,8 @@
 and the current buffer was set up for parsing.  When minor mode is
 enabled parse the current buffer if needed.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if semantic-show-unmatched-syntax-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
           (progn
@@ -476,6 +481,7 @@
     ;; Cleanup unmatched-syntax highlighting
     (semantic-clean-unmatched-syntax-in-buffer))
   semantic-show-unmatched-syntax-mode)
+		(error nil)))
   
 ;;;###autoload
 (defun semantic-show-unmatched-syntax-mode (&optional arg)
@@ -568,6 +574,8 @@
 and the current buffer was set up for parsing.  When minor mode is
 enabled parse the current buffer if needed.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if semantic-show-parser-state-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
           (progn
@@ -635,6 +643,7 @@
 		 'semantic-show-parser-state-marker t)
     )
   semantic-show-parser-state-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun semantic-show-parser-state-mode (&optional arg)
@@ -881,6 +890,8 @@
 For semantic enabled buffers, make the function declaration for the top most
 function \"sticky\".  This is accomplished by putting the first line of
 text for that function in Emacs 21's header line."
+	(condition-case nil
+			(progn 
   (if semantic-stickyfunc-mode
       (progn
 	(unless (and (featurep 'semantic) (semantic-active-p))
@@ -909,6 +920,7 @@
 	(setq header-line-format semantic-stickyfunc-old-hlf)
 	(kill-local-variable 'semantic-stickyfunc-old-hlf))))
   semantic-stickyfunc-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun semantic-stickyfunc-mode (&optional arg)
--- semantic/senator.el	28 Aug 2008 01:17:34 -0000	1.127
+++ semantic/senator.el	16 Oct 2008 14:22:48 -0000
@@ -2292,6 +2292,8 @@
 and the current buffer was set up for parsing.  When minor mode is
 enabled parse the current buffer if needed.  Return non-nil if the
 minor mode is enabled."
+	(condition-case nil
+			(progn 
   (if senator-minor-mode
       (if (not (and (featurep 'semantic) (semantic-active-p)))
           (progn
@@ -2322,6 +2324,7 @@
     ;; Disable semantic isearch
     (setq senator-isearch-semantic-mode nil))
   senator-minor-mode)
+		(error nil)))
 
 ;;;###autoload
 (defun senator-minor-mode (&optional arg)