From c331252d1454e0b7903fec11cd0b1d218bb4c4db Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 15 May 2009 21:22:31 -0700
Subject: [PATCH] Fix #2450 (Crash on send to PRS-700)

---
 src/calibre/utils/podofo/podofo.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/utils/podofo/podofo.cpp b/src/calibre/utils/podofo/podofo.cpp
index 06c95372b7..826f43fade 100644
--- a/src/calibre/utils/podofo/podofo.cpp
+++ b/src/calibre/utils/podofo/podofo.cpp
@@ -48,10 +48,12 @@ podofo_PDFDoc_load(podofo_PDFDoc *self, PyObject *args, PyObject *kwargs) {
         try {
             self->doc->Load(buffer, size);
         } catch(const PdfError & err) {
-            PyErr_SetString(PyExc_ValueError, PdfError::ErrorMessage(err.GetError()));
+            const char *msg = PdfError::ErrorMessage(err.GetError());
+            if (msg == NULL) msg = err.what();
+            PyErr_SetString(PyExc_ValueError, msg);
             return NULL;
-        }
-    } else return NULL;
+    }
+} else return NULL;
 
 
     Py_INCREF(Py_None);