diff --git a/src/java/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolver.java b/src/java/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolver.java
index 9821ff809e9..756dd0e8520 100644
--- a/src/java/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolver.java
+++ b/src/java/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolver.java
@@ -108,7 +108,8 @@ else if(info != null && info.getControllerName() != null) {
                         if(LOG.isDebugEnabled()) {
                             LOG.debug("Matched URI ["+uri+"] to URL mapping ["+info+"], forwarding to ["+forwardUrl+"] with response ["+response.getClass()+"]");
                         }
-                        return null;
+                        // return an empty ModelAndView since the error handler has been processed
+                        return new ModelAndView();
                     }
                 }
             } catch (Exception e) {
diff --git a/src/test/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolverTests.groovy b/src/test/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolverTests.groovy
index f5e854e8fe0..0773d169734 100644
--- a/src/test/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolverTests.groovy
+++ b/src/test/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolverTests.groovy
@@ -1,9 +1,34 @@
 package org.codehaus.groovy.grails.web.errors
 
+import grails.util.GrailsWebUtil;
+
+import java.util.Locale;
+
+import org.codehaus.groovy.grails.commons.DefaultGrailsApplication;
+import org.codehaus.groovy.grails.commons.GrailsApplication;
+import org.codehaus.groovy.grails.support.MockApplicationContext;
+import org.codehaus.groovy.grails.web.mapping.DefaultUrlMappingEvaluator;
+import org.codehaus.groovy.grails.web.mapping.DefaultUrlMappingsHolder;
+import org.codehaus.groovy.grails.web.mapping.UrlMappingsHolder;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.view.InternalResourceView;
+
 /**
  * Test case for {@link GrailsExceptionResolver}.
  */
 class GrailsExceptionResolverTests extends GroovyTestCase {
+	
+	@Override
+	protected void tearDown() throws Exception {
+		RequestContextHolder.setRequestAttributes null
+	}
     void testGetRootCause() {
         def ex = new Exception()
         assertEquals ex, GrailsExceptionResolver.getRootCause(ex)
@@ -19,4 +44,101 @@ class GrailsExceptionResolverTests extends GroovyTestCase {
             GrailsExceptionResolver.getRootCause(null)
         }
     }
+    
+    void testResolveExceptionToView() {
+    	def resolver = new GrailsExceptionResolver()
+    	def mockContext = new MockServletContext()
+    	def mappings = new DefaultUrlMappingEvaluator(mockContext).evaluateMappings {
+    		"500"(view:"myView")
+    	}
+    	
+    	def urlMappingsHolder = new DefaultUrlMappingsHolder(mappings)
+    	def mockCtx = new MockApplicationContext()
+    	def webRequest = GrailsWebUtil.bindMockWebRequest()
+    	
+    	mockCtx.registerMockBean UrlMappingsHolder.BEAN_ID, urlMappingsHolder
+    	mockCtx.registerMockBean "viewResolver", new DummyViewResolver()
+    	mockContext.setAttribute WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, mockCtx
+    	
+    	resolver.servletContext = mockContext
+    	resolver.exceptionMappings = ['java.lang.Exception': '/error'] as Properties
+    	
+    	def ex = new Exception()
+    	def request = webRequest.currentRequest
+    	def response = webRequest.currentResponse
+    	def handler = new Object()
+    	def modelAndView = resolver.resolveException( request, response, handler, ex )
+    	
+    	assertNotNull "should have returned a ModelAndView", modelAndView
+    	assertEquals "/myView", modelAndView.view.url
+    }
+    
+    void testResolveExceptionToController() {
+       	def resolver = new GrailsExceptionResolver()
+    	def mockContext = new MockServletContext()
+    	def mappings = new DefaultUrlMappingEvaluator(mockContext).evaluateMappings {
+    		"500"(controller:"foo", action:"bar")
+    	}
+    	
+    	def urlMappingsHolder = new DefaultUrlMappingsHolder(mappings)
+    	def mockCtx = new MockApplicationContext()
+    	def webRequest = GrailsWebUtil.bindMockWebRequest()
+    	
+    	mockCtx.registerMockBean UrlMappingsHolder.BEAN_ID, urlMappingsHolder
+    	mockCtx.registerMockBean "viewResolver", new DummyViewResolver()
+    	mockCtx.registerMockBean GrailsApplication.APPLICATION_ID, new DefaultGrailsApplication()
+    	mockCtx.registerMockBean "multipartResolver", new CommonsMultipartResolver()
+    	mockContext.setAttribute WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, mockCtx
+    	
+    	resolver.servletContext = mockContext
+    	resolver.exceptionMappings = ['java.lang.Exception': '/error'] as Properties
+    	
+    	def ex = new Exception()
+    	def request = webRequest.currentRequest
+    	MockHttpServletResponse response = webRequest.currentResponse
+    	def handler = new Object()
+    	def modelAndView = resolver.resolveException( request, response, handler, ex )
+    	
+    	assertNotNull "should have returned a ModelAndView", modelAndView
+    	assertTrue modelAndView.empty
+    	
+    	assertEquals "/grails/foo/bar.dispatch",response.getForwardedUrl()
+    }
+    
+    void testResolveExceptionToControllerWhenResponseCommitted() {
+       	def resolver = new GrailsExceptionResolver()
+    	def mockContext = new MockServletContext()
+    	def mappings = new DefaultUrlMappingEvaluator(mockContext).evaluateMappings {
+    		"500"(controller:"foo", action:"bar")
+    	}
+    	
+    	def urlMappingsHolder = new DefaultUrlMappingsHolder(mappings)
+    	def mockCtx = new MockApplicationContext()
+    	def webRequest = GrailsWebUtil.bindMockWebRequest()
+    	
+    	mockCtx.registerMockBean UrlMappingsHolder.BEAN_ID, urlMappingsHolder
+    	mockCtx.registerMockBean "viewResolver", new DummyViewResolver()
+    	mockCtx.registerMockBean GrailsApplication.APPLICATION_ID, new DefaultGrailsApplication()
+    	mockCtx.registerMockBean "multipartResolver", new CommonsMultipartResolver()
+    	mockContext.setAttribute WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, mockCtx
+    	
+    	resolver.servletContext = mockContext
+    	resolver.exceptionMappings = ['java.lang.Exception': '/error'] as Properties
+    	
+    	def ex = new Exception()
+    	def request = webRequest.currentRequest
+    	MockHttpServletResponse response = webRequest.currentResponse
+    	def handler = new Object()
+    	response.setCommitted(true)
+    	def modelAndView = resolver.resolveException( request, response, handler, ex )
+    	
+    	assertNotNull "should have returned a ModelAndView", modelAndView
+    	assertFalse modelAndView.empty
+    }
 }
+class DummyViewResolver implements ViewResolver {
+	public View resolveViewName(String viewName, Locale locale)
+			throws Exception {		
+		return new InternalResourceView(viewName);
+	}
+}
\ No newline at end of file