diff --git a/src/default_line.sld b/src/default_line.sld
index 2ba50e7b162de894f2fd7a3462b1e06e5a05d9f2..674d035b8dafdda79219ea3471a3dcff96413ed3 100644
--- a/src/default_line.sld
+++ b/src/default_line.sld
@@ -1,18 +1,18 @@
-<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
-    <NamedLayer>
-        <Name>foo</Name>
-        <UserStyle>
-            <FeatureTypeStyle>
-                <Rule>
-                    <Name>Class given in default</Name>
-                    <LineSymbolizer>
-                        <Stroke>
-                            <CssParameter name="stroke">#FF7D3F</CssParameter>
-                            <CssParameter name="stroke-width">1.5</CssParameter>
-                        </Stroke>
-                    </LineSymbolizer>
-                </Rule>
-            </FeatureTypeStyle>
-        </UserStyle>
-    </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
+<StyledLayerDescriptor version="1.0.0" xmlns:xsi="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
+  <NamedLayer>
+    <Name>foo</Name>
+    <UserStyle>
+      <FeatureTypeStyle>
+	<Rule>
+	  <Name>Class given in default</Name>
+	  <LineSymbolizer>
+	    <Stroke>
+	      <CssParameter name="stroke">#FF7D3F</CssParameter>
+	      <CssParameter name="stroke-width">1.5</CssParameter>
+	    </Stroke>
+	  </LineSymbolizer>
+	</Rule>
+      </FeatureTypeStyle>
+    </UserStyle>
+  </NamedLayer>
+</StyledLayerDescriptor>
diff --git a/src/default_point.sld b/src/default_point.sld
index ed5ee3f8652eb13eadedfbc982213b7f01f63977..25239dbc543f2a42e0298b94a3dff26675de7316 100644
--- a/src/default_point.sld
+++ b/src/default_point.sld
@@ -1,23 +1,23 @@
-<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
-	<NamedLayer>
-		<Name>foo</Name>
-		<UserStyle>
-			<FeatureTypeStyle>
-				<Rule>
-					<Name>Class given in default</Name>
-					<PointSymbolizer>
-						<Graphic>
-							<Size>6.0</Size>
-							<Mark>
-								<WellKnownName>circle</WellKnownName>
-								<Fill>
-									<CssParameter name="fill">#6D35AD</CssParameter>
-								</Fill>
-							</Mark>
-						</Graphic>
-					</PointSymbolizer>
-				</Rule>
-			</FeatureTypeStyle>
-		</UserStyle>
-	</NamedLayer>
+<StyledLayerDescriptor version="1.0.0" xmlns:xsi="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
+  <NamedLayer>
+    <Name>foo</Name>
+    <UserStyle>
+      <FeatureTypeStyle>
+	<Rule>
+	  <Name>Class given in default</Name>
+	  <PointSymbolizer>
+	    <Graphic>
+	      <Size>6.0</Size>
+	      <Mark>
+		<WellKnownName>circle</WellKnownName>
+		<Fill>
+		  <CssParameter name="fill">#6D35AD</CssParameter>
+		</Fill>
+	      </Mark>
+	    </Graphic>
+	  </PointSymbolizer>
+	</Rule>
+      </FeatureTypeStyle>
+    </UserStyle>
+  </NamedLayer>
 </StyledLayerDescriptor>
\ No newline at end of file
diff --git a/src/default_polygon.sld b/src/default_polygon.sld
index ae09b0e149591dcac524387b61b893f2332dbcb8..5dc3982c4e28663f4c6a617defb3745d2b496a4c 100644
--- a/src/default_polygon.sld
+++ b/src/default_polygon.sld
@@ -1,21 +1,21 @@
-<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
-    <NamedLayer>
-        <Name>foo</Name>
-        <UserStyle>
-            <FeatureTypeStyle>
-                <Rule>
-                    <Name>Class given in default</Name>
-                    <PolygonSymbolizer>
-                        <Fill>
-                            <CssParameter name="fill">#95F9D6</CssParameter>
-                        </Fill>
-                        <Stroke>
-                            <CssParameter name="stroke">#2AAB7E</CssParameter>
-                            <CssParameter name="stroke-width">1</CssParameter>
-                        </Stroke>
-                    </PolygonSymbolizer>
-                </Rule>
-            </FeatureTypeStyle>
-        </UserStyle>
-    </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
+<StyledLayerDescriptor version="1.0.0" xmlns:xsi="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
+  <NamedLayer>
+    <Name>foo</Name>
+    <UserStyle>
+      <FeatureTypeStyle>
+	<Rule>
+	  <Name>Class given in default</Name>
+	  <PolygonSymbolizer>
+	    <Fill>
+	      <CssParameter name="fill">#95F9D6</CssParameter>
+	    </Fill>
+	    <Stroke>
+	      <CssParameter name="stroke">#2AAB7E</CssParameter>
+	      <CssParameter name="stroke-width">1</CssParameter>
+	    </Stroke>
+	  </PolygonSymbolizer>
+	</Rule>
+      </FeatureTypeStyle>
+    </UserStyle>
+  </NamedLayer>
+</StyledLayerDescriptor>
diff --git a/src/mapfile.py b/src/mapfile.py
index 9903fb688fd89ecb0a6328722319c0688459608f..5e2e3077f13888ea23056acc55acb69fcd79e982 100644
--- a/src/mapfile.py
+++ b/src/mapfile.py
@@ -143,6 +143,7 @@ class Layer(MetadataMixin):
         # an html parser, which luckily is much more forgiving.
         from xml.dom.minidom import parseString
 
+        print "SLD:\n\n%s\n" % new_sld
         xmlsld = parseString(new_sld)
 
         try:
diff --git a/src/server.py b/src/server.py
index 05b438e44fa541a0ce0ffcb523baa4e1c0d1f117..eea80095ff61cae6c1ec612cc236467f188c206c 100755
--- a/src/server.py
+++ b/src/server.py
@@ -759,7 +759,7 @@ class layers(object):
             try:
                 model = ws.get_model(r_name, r_type[:-1], st_name)
             except ValueError:
-                webapp.NotFound("Invalid layer model '%s'" % r_type[:-1])
+                raise webapp.NotFound("Invalid layer model '%s'" % r_type[:-1])
 
         with webapp.mightConflict("layer", mapfile=map_name):
             mf.create_layer(ws, model, l_name, l_enabled)