diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/MethodCreator.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/MethodCreator.java
index 6f5305b..4d0b960 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/MethodCreator.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/MethodCreator.java
@@ -214,7 +214,11 @@
         if ((access & ACC_STATIC) == ACC_STATIC) { return super.visitMethod(access, name, desc, signature, exceptions); }
 
         MethodDescriptor md = getMethodDescriptor(name, desc);
-        generateMethodHeader(access, name, desc, signature, exceptions, md.getAnnotations());
+        if (md == null) {
+            generateMethodHeader(access, name, desc, signature, exceptions, new ArrayList(0));
+        } else {
+            generateMethodHeader(access, name, desc, signature, exceptions, md.getAnnotations());
+        }
         
         String id = generateMethodFlag(name, desc);
         if (! m_methodFlags.contains(id)) {