diff --git a/rtv/content.py b/rtv/content.py
index 6299da3..4e5b296 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -240,14 +240,11 @@ class SubredditContent(BaseContent):
             self.get(0)
         except (praw.errors.APIException, requests.HTTPError,
                 praw.errors.RedirectException):
-            raise SubredditError(display_name)
+            raise SubredditError(name)
 
     @classmethod
     def from_name(cls, reddit, name, loader, order='hot', query=None):
 
-        if order not in ['hot', 'top', 'rising', 'new', 'controversial']:
-            raise SubredditError(display_name)
-
         name = name.strip(' /')  # Strip leading and trailing backslashes
         if name.startswith('r/'):
             name = name[2:]
@@ -260,6 +257,9 @@ class SubredditContent(BaseContent):
         if order != 'hot':
             display_name += '/{}'.format(order)
 
+        if order not in ['hot', 'top', 'rising', 'new', 'controversial']:
+            raise SubredditError(name)
+
         if name == 'me':
             if not reddit.is_logged_in():
                 raise AccountError