diff --git a/pywps/app/Service.py b/pywps/app/Service.py
index f5a2e5cc7..df80d56b6 100755
--- a/pywps/app/Service.py
+++ b/pywps/app/Service.py
@@ -114,7 +114,7 @@ def _parse_and_execute(self, process, wps_request, uuid):
             if not request_inputs:
                 if inpt._default is not None:
                     if not inpt.data_set and isinstance(inpt, ComplexInput):
-                            inpt._set_default_value()
+                        inpt._set_default_value()
 
                     data_inputs[inpt.identifier] = [inpt.clone()]
             else:
diff --git a/pywps/response/execute.py b/pywps/response/execute.py
index 844ca64e4..eaa168b69 100755
--- a/pywps/response/execute.py
+++ b/pywps/response/execute.py
@@ -212,7 +212,7 @@ def __call__(self, request):
                 if wps_output_value.source_type is None:
                     return NoApplicableCode("Expected output was not generated")
                 return Response(wps_output_value.data,
-                                mimetype=self.wps_request.outputs[wps_output_identifier]['mimetype'])
+                                mimetype=self.wps_request.outputs[wps_output_identifier].get('mimetype', None))
         else:
             if not self.doc:
                 return NoApplicableCode("Output was not generated")