diff --git a/src/error/PhutilErrorHandler.php b/src/error/PhutilErrorHandler.php
index deb6ee16..95af88b6 100644
--- a/src/error/PhutilErrorHandler.php
+++ b/src/error/PhutilErrorHandler.php
@@ -180,10 +180,10 @@ final class PhutilErrorHandler extends Phobject {
    * @return void
    * @task internal
    */
-  public static function handleError($num, $str, $file, $line, $ctx) {
+  public static function handleError($num, $str, $file, $line, $ctx = null) {
 
     foreach (self::$traps as $trap) {
-      $trap->addError($num, $str, $file, $line, $ctx);
+      $trap->addError($num, $str, $file, $line);
     }
 
     if ((error_reporting() & $num) == 0) {
@@ -214,7 +214,6 @@ final class PhutilErrorHandler extends Phobject {
         array(
           'file'       => $file,
           'line'       => $line,
-          'context'    => $ctx,
           'error_code' => $num,
           'trace'      => $trace,
         ));
diff --git a/src/error/PhutilErrorTrap.php b/src/error/PhutilErrorTrap.php
index 94d291d0..252a37f9 100644
--- a/src/error/PhutilErrorTrap.php
+++ b/src/error/PhutilErrorTrap.php
@@ -41,13 +41,12 @@ final class PhutilErrorTrap extends Phobject {
   private $destroyed;
   private $errors = array();
 
-  public function addError($num, $str, $file, $line, $ctx) {
+  public function addError($num, $str, $file, $line) {
     $this->errors[] = array(
       'num' => $num,
       'str' => $str,
       'file' => $file,
       'line' => $line,
-      'ctx' => $ctx,
     );
     return $this;
   }