diff --git a/sources/Rowan UI Base.pax b/sources/Rowan UI Base.pax
index 32751fea..19722125 100644
--- a/sources/Rowan UI Base.pax	
+++ b/sources/Rowan UI Base.pax	
@@ -2327,9 +2327,15 @@ browseChangedThing
 	selection := operationListPresenter selectionOrNil.
 	selection isNil ifTrue: [^MessageBox notify: 'Nothing to browse'].
 	selection isRemoval ifTrue: [^MessageBox notify: 'Cannot browse a removed item'].
+	
+	[classService := RowanClassService named: selection className.
 	shell := JadeiteProjectsSystemBrowser showOnSession: gciSession.
-	classService := RowanClassService named: selection className.
-	shell currentCard updateServices: (Array with: classService).
+	shell currentCard updateServices: (Array with: classService)]
+			on: Error
+			do: 
+				[:ex |
+				shell destroy.
+				MessageBox notify: 'The change you have selected cannot be browsed'].
 	shell currentCard updateAfterFindClass: classService!
 
 operationSelected