diff --git a/bin/pdf2htmlEX b/bin/pdf2htmlEX
index 38d66f6..eec482c 100755
--- a/bin/pdf2htmlEX
+++ b/bin/pdf2htmlEX
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 # Get directory of the script
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
diff --git a/src/HTMLRenderer.cc b/src/HTMLRenderer.cc
index 991ebbc..fdea29d 100644
--- a/src/HTMLRenderer.cc
+++ b/src/HTMLRenderer.cc
@@ -458,8 +458,10 @@ void HTMLRenderer::drawChar(GfxState *state, double x, double y,
     if ((state->getRender() & 3) == 3)
         return ;
 
-    //cur_string->addChars(state, x, y, dx, dy, code, nBytes);
-    cur_string->addUnicodes(state, x, y, dx, dy, u, uLen);
+    if(uLen > 0)
+        cur_string->addUnicodes(state, x, y, dx, dy, u, uLen);
+    else
+        cur_string->addChars(state, x, y, dx, dy, code, nBytes);
 }
 
 // TODO