diff --git a/source/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java b/source/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
index 3cf4af638eed..c10853feb2d0 100644
--- a/source/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
+++ b/source/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
@@ -60,10 +60,10 @@ public class ConvertToInstanceMethodHandler implements RefactoringActionHandler
     for (int i = 0; i < parameters.length; i++) {
       final PsiParameter parameter = parameters[i];
       final PsiType type = parameter.getType();
-      if (type instanceof PsiClassType) {
+      if (type instanceof PsiClassType && !((PsiClassType)type).hasParameters()) {
         classTypesFound = true;
         final PsiClass psiClass = ((PsiClassType)type).resolve();
-        if (psiClass != null) {
+        if (psiClass != null && !(psiClass instanceof PsiTypeParameter)) {
           resolvableClassesFound = true;
           final boolean inProject = method.getManager().isInProject(psiClass);
           if (inProject) {
diff --git a/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java b/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
index caa3ca5b4df8..2fadbb248c39 100644
--- a/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
+++ b/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
@@ -77,10 +77,10 @@ public class MoveInstanceMethodHandler implements RefactoringActionHandler {
     for (Iterator<PsiVariable> iterator = allVariables.iterator(); iterator.hasNext();) {
       PsiVariable variable = iterator.next();
       final PsiType type = variable.getType();
-      if (type instanceof PsiClassType) {
+      if (type instanceof PsiClassType && !((PsiClassType)type).hasParameters()) {
         classTypesFound = true;
         final PsiClass psiClass = ((PsiClassType)type).resolve();
-        if (psiClass != null) {
+        if (psiClass != null && !(psiClass instanceof PsiTypeParameter)) {
           resolvableClassesFound = true;
           final boolean inProject = method.getManager().isInProject(psiClass);
           if (inProject) {