--- psiconv/trunk/lib/psiconv/generate_word.c	2004/02/25 20:57:10	231
+++ psiconv/trunk/lib/psiconv/generate_word.c	2014/10/22 19:53:40	351
@@ -1,6 +1,6 @@
 /*
     generate_word.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 2000-2004  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 2000-2014  Frodo Looijaard <frodo@frodo.looijaard.name>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -94,11 +94,13 @@
   }
 
   if (!(basepara=psiconv_basic_paragraph_layout())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
 
   if (!(basechar=psiconv_basic_character_layout())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
@@ -133,7 +135,7 @@
 
   for (i = 0; i < psiconv_list_length(value->styles); i++) {
     if (!(style = psiconv_list_get(value->styles,i))) {
-      psiconv_error(config,lev,0,"Massive memory corruption");
+      psiconv_error(config,lev,0,"Data structure corruption");
       res = -PSICONV_E_NOMEM;
       goto ERROR3;
     }
@@ -148,7 +150,7 @@
     goto ERROR3;
   for (i = 0; i < psiconv_list_length(value->styles); i++) {
     if (!(style = psiconv_list_get(value->styles,i))) {
-      psiconv_error(config,lev,0,"Massive memory corruption");
+      psiconv_error(config,lev,0,"Data structure corruption");
       res = -PSICONV_E_NOMEM;
       goto ERROR3;
     }