diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java
index d35ad947731..0175fb6cc1b 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java
@@ -157,16 +157,19 @@ public class ConnectorServicesForm extends SystemBaseForm
 	protected String getCurrentVerbage()
 	{
 		if (_serviceViewer == null)
-			return "";
+			return ""; //$NON-NLS-1$
 		else
 		{
 			IStructuredSelection serviceSelection = (IStructuredSelection)_serviceViewer.getSelection();
 			if (serviceSelection == null || serviceSelection.isEmpty())
 			{
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 			else
-				return ((ServiceElement)serviceSelection.getFirstElement()).getDescription();
+			{
+				String description = ((ServiceElement)serviceSelection.getFirstElement()).getDescription(); 
+				return description!=null ? description : ""; //$NON-NLS-1$  
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java
index 9f51ac3d974..aaa1fc881ee 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java
@@ -288,26 +288,23 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener
 	
 	protected String getCurrentVerbage()
 	{
-		if (_serviceViewer == null)
-			return "";
-		else
+		String description = null;
+		if (_serviceViewer != null)
 		{
 			IStructuredSelection serviceSelection = (IStructuredSelection)_serviceViewer.getSelection();
-			if (serviceSelection == null || serviceSelection.isEmpty())
+			if (serviceSelection != null && !serviceSelection.isEmpty())
 			{
-				if (_factoryViewer == null)
-					return "";
-				else
+				description = ((ServiceElement)serviceSelection.getFirstElement()).getDescription();
+			}
+			else if (_factoryViewer != null)
+			{
+				IStructuredSelection factorySelection = (IStructuredSelection) _factoryViewer.getSelection();
+				if (factorySelection != null && !factorySelection.isEmpty())
 				{
-					IStructuredSelection factorySelection = (IStructuredSelection) _factoryViewer.getSelection();
-					if (factorySelection == null || factorySelection.isEmpty())
-						return "";
-					else
-						return ((ServiceElement)factorySelection.getFirstElement()).getDescription();
+					description = ((ServiceElement)factorySelection.getFirstElement()).getDescription(); 
 				}
 			}
-			else
-				return ((ServiceElement)serviceSelection.getFirstElement()).getDescription();
 		}
+		return description != null ? description : ""; //$NON-NLS-1$
 	}
 }
\ No newline at end of file