--- a/flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java	Mon Apr 15 18:27:37 2013 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java	Mon Apr 15 18:32:37 2013 +0200
@@ -427,10 +427,22 @@
                 try {
                     byte [] buf = new byte[4096];
                     int r;
-                    resp.setHeader("Content-Disposition",
-                            "attachment;filename=flys-karte.pdf");
-                    resp.setContentType("application/pdf");
+                    boolean checkedErrors = false;
                     while ((r = in.read(buf)) >= 0) {
+                        if (!checkedErrors) {
+                            checkedErrors = true;
+                            String header = new String(buf, "UTF-8");
+                            if (header.contains("Error while generating PDF:")) {
+                                resp.setContentType("text/plain");
+                            } else {
+                                // Only send content disposition and filename content
+                                // type when we have a pdf
+                                resp.setHeader("Content-Disposition",
+                                        "attachment;filename=flys-karte.pdf");
+                                resp.setContentType("application/pdf");
+                            }
+
+                        }
                         out.write(buf, 0, r);
                     }
                     out.flush();