Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 7083)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 7084)
@@ -732,8 +732,10 @@
         self.wf_info = IWorkflowInfo(self.context)
         self.max_upload_size = string_from_bytes(MAX_UPLOAD_SIZE)
+        self.passport_changed = None
         upload = self.request.form.get('form.passport', None)
         if upload:
             # We got a fresh upload
-            passport_changed = handle_img_upload(upload, self.context, self)
+            self.passport_changed = handle_img_upload(
+                upload, self.context, self)
         return
 
@@ -760,8 +762,12 @@
     @grok.action('Save')
     def save(self, **data):
+        if self.passport_changed is False:  # False is not None!
+            return # error during image upload. Ignore other values
         changed_fields = self.applyData(self.context, **data)
         changed_fields = changed_fields.values()
         fields_string = '+'.join(
             ' + '.join(str(i) for i in b) for b in changed_fields)
+        if self.passport_changed:
+            fields_string += ' + passport'
         self.context._p_changed = True
         form = self.request.form
@@ -810,4 +816,6 @@
     @grok.action('Save')
     def save(self, **data):
+        if self.passport_changed is False:  # False is not None!
+            return # error during image upload. Ignore other values
         self.applyData(self.context, **data)
         self.context._p_changed = True
@@ -817,4 +825,6 @@
     @grok.action('Final Submit')
     def finalsubmit(self, **data):
+        if self.passport_changed is False:  # False is not None!
+            return # error during image upload. Ignore other values
         self.applyData(self.context, **data)
         self.context._p_changed = True
