diff --git a/base/decorators.py b/base/decorators.py
index c64ce2cef0..80b0fe4ffd 100644
--- a/base/decorators.py
+++ b/base/decorators.py
@@ -57,9 +57,10 @@ def repo_passwd_set_required(func):
     def _decorated(request, *args, **kwargs):
         repo_id = kwargs.get('repo_id', None)
         if not repo_id:
-            # TODO: raise error
-            pass
+            raise Exception, 'Repo id is not found in url.'
         repo = get_repo(repo_id)
+        if not repo:
+            raise Http404
         username = request.user.username
         if repo.encrypted and not is_passwd_set(repo_id, username):
             # Redirect uesr to decrypt repo page.