--- a/buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/AntComment.java	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/sf/java/antdata/src/com/nokia/helium/ant/data/AntComment.java	Thu Jul 22 17:08:43 2010 +0300
@@ -96,7 +96,9 @@
                 while (tokenizer.hasMoreElements()) {
                     String tagText = (String) tokenizer.nextElement();
                     String[] tagParts = tagText.split("\\s", 2);
-                    tags.put(tagParts[0], tagParts[1].trim());
+                    if (tagParts.length > 1) {
+                        tags.put(tagParts[0], tagParts[1].trim());
+                    }
                 }
             }
         }