diff --git a/r2/r2/controllers/toolbar.py b/r2/r2/controllers/toolbar.py
index d5b830e50..9e8c9844b 100644
--- a/r2/r2/controllers/toolbar.py
+++ b/r2/r2/controllers/toolbar.py
@@ -29,6 +29,7 @@ class ToolbarController(RedditController):
 
     @validate(link = VByName('id'))
     def GET_toolbar(self, link):
+        if not link: return self.abort404()
         link_builder = IDBuilder((link._fullname,))
         link_listing = LinkListing(link_builder, nextprev=False).listing()
         res = FrameToolbar(link = link_listing.things[0]).render()
diff --git a/r2/r2/templates/listing.htmllite b/r2/r2/templates/listing.htmllite
index 6764bde3c..f4deb9ccf 100644
--- a/r2/r2/templates/listing.htmllite
+++ b/r2/r2/templates/listing.htmllite
@@ -25,14 +25,13 @@
   <% 
      t = thing.things
      l = len(t)
+     two_col = request.get.has_key("twocolumn") if l else False
    %>
   %for i, a in enumerate(t):
    <% 
       cls = "reddit-link "
       cls += "odd " if i % 2 else "even "
       cls += "first-half" if i < (l+1)/2 else "second-half"
-
-      two_col = request.get.has_key("twocolumn")
     %>
    %if two_col:
      %if i == 0: