diff --git a/akka-http/src/main/scala/akka/http/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala
index 22b4056b16..ae2648cea2 100644
--- a/akka-http/src/main/scala/akka/http/Mist.scala
+++ b/akka-http/src/main/scala/akka/http/Mist.scala
@@ -341,24 +341,22 @@ trait RequestMethod {
   def request = context.get.getRequest.asInstanceOf[HttpServletRequest]
   def response = context.get.getResponse.asInstanceOf[HttpServletResponse]
 
-  def getHeaderOrElse(name: String, default: Function[Any, String]): String =
+  def getHeaderOrElse(name: String, default: ⇒ String): String =
     request.getHeader(name) match {
-      case null ⇒ default(null)
+      case null ⇒ default
       case s    ⇒ s
     }
 
-  def getParameterOrElse(name: String, default: Function[Any, String]): String =
+  def getParameterOrElse(name: String, default: ⇒ String): String =
     request.getParameter(name) match {
-      case null ⇒ default(null)
+      case null ⇒ default
       case s    ⇒ s
     }
 
-  def complete(status: Int, body: String): Boolean = complete(status, body, Headers())
-
-  def complete(status: Int, body: String, headers: Headers): Boolean =
+  def complete(status: Int, body: String, headers: Headers = Headers()): Boolean =
     rawComplete { res ⇒
       res.setStatus(status)
-      headers foreach { h ⇒ response.setHeader(h._1, h._2) }
+      headers foreach { case (name, value) ⇒ response.setHeader(name, value) }
       res.getWriter.write(body)
       res.getWriter.close
       res.flushBuffer
diff --git a/akka-http/src/main/scala/akka/http/Servlet30Context.scala b/akka-http/src/main/scala/akka/http/Servlet30Context.scala
index 2d354d9a10..cbafffaea3 100644
--- a/akka-http/src/main/scala/akka/http/Servlet30Context.scala
+++ b/akka-http/src/main/scala/akka/http/Servlet30Context.scala
@@ -45,8 +45,8 @@ trait Servlet30Context extends AsyncListener {
   //
   def onComplete(e: AsyncEvent) {}
   def onError(e: AsyncEvent) = e.getThrowable match {
-    case null ⇒ {}
-    case t    ⇒ {}
+    case null ⇒
+    case t    ⇒ EventHandler.error(t, this, t.getMessage)
   }
   def onStartAsync(e: AsyncEvent) {}
   def onTimeout(e: AsyncEvent) = {