Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java
===================================================================
--- lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java	(revision 1334950)
+++ lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java	(working copy)
@@ -104,10 +104,23 @@
     this.ignoreCase = ignoreCase;
     String encoding = getDictionaryEncoding(affix);
     CharsetDecoder decoder = getJavaEncoding(encoding);
-    readAffixFile(affix, decoder);
+    try {
+      readAffixFile(affix, decoder);
+    } catch(IOException ioe) {
+      throw ioe;
+    } catch(Exception e) {
+      throw new RuntimeException("Error while parsing the affix file", e);
+    }
+
     words = new CharArrayMap<List<HunspellWord>>(version, 65535 /* guess */, this.ignoreCase);
     for (InputStream dictionary : dictionaries) {
-      readDictionaryFile(dictionary, decoder);
+      try {
+        readDictionaryFile(dictionary, decoder);
+      } catch(IOException ioe) {
+        throw ioe;
+      } catch(Exception e) {
+        throw new RuntimeException("Error while parsing the dictionary file", e);
+      }
     }
   }