diff --git a/src/helma/doc/DocTag.java b/src/helma/doc/DocTag.java
index a63eddf2..690500ce 100644
--- a/src/helma/doc/DocTag.java
+++ b/src/helma/doc/DocTag.java
@@ -51,7 +51,11 @@ public final class DocTag	{
 			String name = "";
 			if (tok.hasMoreTokens ())
 				name = tok.nextToken ();
-			return new DocTag (kind, name, content.substring (name.length ()+1).trim ());
+			String comment = "";
+			try {
+				comment = content.substring (name.length ()+1).trim ();
+			} catch (StringIndexOutOfBoundsException e) { }
+			return new DocTag (kind, name, comment);
 		} else {
 			return new DocTag (kind, "", content);
 		}