--- a/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/midp2/install/steps/HandleCustomAttributes.java	Wed Aug 18 09:43:15 2010 +0300
+++ b/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/midp2/install/steps/HandleCustomAttributes.java	Thu Sep 02 20:20:40 2010 +0300
@@ -102,6 +102,11 @@
         }
         for (int i = 1; true; i++)
         {
+            if (apps.size() < i)
+            {
+                break;
+            }
+
             String attrName = "Nokia-MIDlet-Auto-Start-" + i;
             String attrValue = aBall.getAttributeValue(attrName);
 
@@ -122,9 +127,12 @@
 
             if (attrValue != null)
             {
-                if (apps.size() < i)
+                if (!aBall.attributeExistsInJar(attrName))
                 {
-                    break;
+                    // The attribute is only in .jad, ignore it.
+                    Log.logWarning("Attribute " + attrName +
+                        " ignored because it is not in Manifest");
+                    continue;
                 }
 
                 // Check if MIDlet has permission for Auto-start
@@ -171,10 +179,6 @@
                       OtaStatusCode.INVALID_JAR));
                 }
             }
-            else
-            {
-                break;
-            }
         }
     }
 }