diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractExpression.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractExpression.java
index 42a010d6f39..57c6abc7563 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractExpression.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractExpression.java
@@ -226,6 +226,7 @@ public class ExtractExpression extends ExtractedFunctionConstructionHelper {
 		} catch (DOMException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+			name= new CPPASTName(classType.getNameCharArray());
 		}
 		
 		return new CPPASTNamedTypeSpecifier(name.copy());
@@ -255,6 +256,7 @@ public class ExtractExpression extends ExtractedFunctionConstructionHelper {
 		} catch (DOMException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+			name= new CPPASTName(typedef.getNameCharArray());
 		}
 		return new CPPASTNamedTypeSpecifier(name.copy());
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
index e4c1f0ea9f0..2012022851e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
@@ -17,6 +17,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.core.runtime.Assert;
+
 import org.eclipse.cdt.core.dom.ast.IASTASMDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
 import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
@@ -99,7 +101,7 @@ public class TrailNodeEqualityChecker implements EqualityChecker<IASTNode> {
 			} else if(node instanceof IASTName){
 				return isNameEquals(trailNode, node);
 			} else {
-				assert true : "Unexpected Node, this code shoud nod reached"; //$NON-NLS-1$
+				Assert.isLegal(false, "Unexpected Node, this code shoud nod reached"); //$NON-NLS-1$
 				return true;
 			}
 		}