diff --git a/core/views/uploads.py b/core/views/uploads.py
index e46ddba..9bfbc18 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -102,7 +102,12 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl):
     Loads the survex files names and processes all complaints
     
     '''
-    w = Wallet.objects.get(walletname=wallet)
+    # If skipping through the wllets on the upload form, the wallet may not yet exist
+    try:
+        w = Wallet.objects.get(walletname=wallet)
+    except ObjectDoesNotExist:
+        return None, None
+        
     ticks = w.get_ticks()
     
     # Date