diff --git a/netbox/extras/api/mixins.py b/netbox/extras/api/mixins.py
index 7f8c4a865..a45c79bca 100644
--- a/netbox/extras/api/mixins.py
+++ b/netbox/extras/api/mixins.py
@@ -77,7 +77,7 @@ class RenderConfigMixin(ConfigTemplateRenderMixin):
     @action(detail=True, methods=['post'], url_path='render-config', renderer_classes=[JSONRenderer, TextRenderer])
     def render_config(self, request, pk):
         """
-        Resolve and render the preferred ConfigTemplate for this Device.
+        Resolve and render the preferred ConfigTemplate for this Device or Virtual Machine.
         """
         # Override restrict() on the default queryset to enforce the render_config & view actions
         self.queryset = self.queryset.model.objects.restrict(request.user, 'render_config').restrict(
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index bdce5c5c1..08b7d3ecf 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1281,7 +1281,7 @@ class ObjectRenderConfigView(generic.ObjectView):
 
         # Render the config template
         rendered_config = None
-        if config_template and not error_message:
+        if config_template:
             try:
                 rendered_config = config_template.render(context=context_data)
             except TemplateError as e: