Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py	(revision 7416)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py	(revision 7417)
@@ -134,11 +134,9 @@
         file_store = getUtility(IExtFileStore)
         appl_file = file_store.getFileByContext(self)
+        if appl_file is None:
+            return
         stud_file_id = IFileStoreNameChooser(student).chooseName(
             attr="passport.jpg")
-        try:
-            file_store.createFile(stud_file_id, appl_file)
-        except AttributeError:
-            # Pass if passport picture doesn't exist
-            pass
+        file_store.createFile(stud_file_id, appl_file)
         return
 
