diff --git a/admin.py b/admin.py
index 6716dbe8..a4d63cbf 100644
--- a/admin.py
+++ b/admin.py
@@ -22,7 +22,7 @@ class FollowUpAdmin(admin.ModelAdmin):
 
 class KBItemAdmin(admin.ModelAdmin):
     list_display = ('category', 'title', 'last_updated',)
-    list_display_links = ('title')
+    list_display_links = ('title',)
 
 admin.site.register(Ticket, TicketAdmin)
 admin.site.register(Queue, QueueAdmin)
diff --git a/models.py b/models.py
index 430dc3ba..d3baa233 100644
--- a/models.py
+++ b/models.py
@@ -592,6 +592,8 @@ class Attachment(models.Model):
 
     def get_upload_to(self, field_attname):
         """ Get upload_to path specific to this item """
+        if not self.id:
+            return u''
         return u'helpdesk/attachments/%s/%s' % (
             self.followup.ticket.ticket_for_url,
             self.followup.id