diff --git a/Dockerfile b/Dockerfile
index 9c2f9c5f8..f60ccd073 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,3 +45,4 @@ WORKDIR /usr/src/paperless/src
 VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/consume", "/export"]
 ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
 CMD ["--help"]
+
diff --git a/requirements.txt b/requirements.txt
index ce172e92a..c3875b3b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ pdftotext>=2.0.1
 
 # For the tests
 factory-boy
-pytest
+pytest==3.3.2  # Newer versions break with pytest-sugar
 pytest-django
 pytest-sugar
 pytest-env
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 37a1329f2..09ac5f672 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 1, 0)
+__version__ = (1, 2, 0)
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 7a36fcdd6..3d0f82b3e 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -260,6 +260,6 @@ def get_text_from_pdf(pdf_file):
         try:
             pdf = pdftotext.PDF(f)
         except pdftotext.Error:
-            return False
+            return ""
 
     return "\n".join(pdf)