diff --git a/api/handlers/listhandler.py b/api/handlers/listhandler.py
index fd1ab0405b0bf809c1810adcb5b1f945cb91713d..f14fcc36d222621c2ea47083ad46086834755a4d 100644
--- a/api/handlers/listhandler.py
+++ b/api/handlers/listhandler.py
@@ -502,8 +502,10 @@ class FileListHandler(ListHandler):
     def get_info(self, cont_name, list_name, **kwargs):
         _id = kwargs['cid']
         filename = kwargs['name']
+        result = super(FileListHandler,self).get(cont_name, list_name, **kwargs)
         self.log_user_access(AccessType.view_file, cont_name=cont_name, cont_id=_id, filename=filename)
-        return super(FileListHandler,self).get(cont_name, list_name, **kwargs)
+        return result
+
 
     def modify_info(self, cont_name, list_name, **kwargs):
         _id = kwargs.pop('cid')
diff --git a/tests/integration_tests/python/test_containers.py b/tests/integration_tests/python/test_containers.py
index 8a5437348012a3f2f166549e18b3049b64056537..e0134a9cb9075d8ef79b82824b47ebab174995ab 100644
--- a/tests/integration_tests/python/test_containers.py
+++ b/tests/integration_tests/python/test_containers.py
@@ -789,6 +789,13 @@ def test_edit_file_info(data_builder, as_admin, file_form):
     project = data_builder.create_project()
     file_name = 'test_file.txt'
 
+
+    # Assert getting file info 404s properly
+    r = as_admin.get('/projects/' + project + '/files/' + 'not_real.txt' + '/info')
+    assert r.status_code == 404
+    r = as_admin.get('/projects/' + '000000000000000000000000' + '/files/' + 'not_real.txt' + '/info')
+    assert r.status_code == 404
+
     r = as_admin.post('/projects/' + project + '/files', files=file_form(file_name))
     assert r.ok