diff --git a/apps/documents/models.py b/apps/documents/models.py
index 04cea2f1a4..f641f9a8e9 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -29,8 +29,7 @@ if FILESYSTEM_SLUGIFY_PATHS == False:
 
 def get_filename_from_uuid(instance, filename, directory=STORAGE_DIRECTORY_NAME):
     populate_file_extension_and_mimetype(instance, filename)
-    stem, extension = os.path.splitext(filename)
-    return '%s/%s%s' % (directory, instance.uuid, extension)
+    return '%s/%s' % (directory, instance.uuid)
 
 def populate_file_extension_and_mimetype(instance, filename):
     # First populate the file extension and mimetype
@@ -80,6 +79,9 @@ class Document(models.Model):
         self.checksum = unicode(CHECKSUM_FUNCTION(self.file.read()))
         if save:
             self.save()
+    
+    def exists(self):
+        return self.file.storage.exists(self.file.url)
         
     def save(self, *args, **kwargs):
         self.update_checksum(save=False)
diff --git a/apps/documents/views.py b/apps/documents/views.py
index a385db95ba..de385cc4e1 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -126,7 +126,8 @@ def document_view(request, document_id):
         {'label':_(u'File mimetype'), 'field':'file_mimetype'},
         {'label':_(u'Date added'), 'field':'date_added'},
         {'label':_(u'Checksum'), 'field':'checksum'},
-        {'label':_(u'UUID'), 'field':'uuid'}
+        {'label':_(u'UUID'), 'field':'uuid'},
+        {'label':_(u'Exists in storage'), 'field':'exists'}
     ])
     
     return render_to_response('generic_detail.html', {