Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2

1 files changed, 2 insertions, 0 deletions

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 90516837..db6bf3e2 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -33,6 +33,8 @@ class Response(SimpleTemplateResponse):
 
     @property
     def rendered_content(self):
+        assert self.renderer, "No renderer set on Response"
+
         self['Content-Type'] = self.renderer.media_type
         if self.data is None:
             return self.renderer.render()