From 09c5eb6a160b29cf3405b17ddb8d0b96c9ae1fc2 Mon Sep 17 00:00:00 2001
From: "Marshall T. Vandegrift" <llasram@gmail.com>
Date: Sat, 20 Dec 2008 16:42:05 -0500
Subject: [PATCH] Use calibre plugin-loading error code correctly.

---
 src/calibre/ebooks/lit/lzx.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/lit/lzx.py b/src/calibre/ebooks/lit/lzx.py
index f91f3871b7..ee46e729c3 100644
--- a/src/calibre/ebooks/lit/lzx.py
+++ b/src/calibre/ebooks/lit/lzx.py
@@ -8,10 +8,14 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 import sys
 from calibre import plugins
-_lzx, LZXError = plugins['lzx']
+
+_lzx, _error = plugins['lzx']
+if _lzx is None:
+    raise RuntimeError('Failed to load the lzx plugin: %s' % _error)
 
 __all__ = ['Compressor', 'Decompressor', 'LZXError']
 
+LZXError = _lzx.LZXError
 Compressor = _lzx.Compressor
 
 class Decompressor(object):