diff --git a/src/Monolog/Formatter/RavenFormatter.php b/src/Monolog/Formatter/RavenFormatter.php
index 8da490c0..7fdc40f3 100644
--- a/src/Monolog/Formatter/RavenFormatter.php
+++ b/src/Monolog/Formatter/RavenFormatter.php
@@ -43,10 +43,6 @@ class RavenFormatter extends NormalizerFormatter
         $record['level'] = $this->logLevels[$record['level']];
         $record['message'] = $record['channel'] . ': ' . $record['message'];
 
-        if (isset($record['context']['context'])) {
-            $record['context'] = $record['context']['context'];
-        }
-
         return $record;
     }
 }
diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php
index 0c38d71a..94fc4242 100644
--- a/src/Monolog/Handler/RavenHandler.php
+++ b/src/Monolog/Handler/RavenHandler.php
@@ -54,8 +54,8 @@ class RavenHandler extends AbstractProcessingHandler
      */
     protected function write(array $record)
     {
-        if ($record['level'] == Logger::ERROR) {
-            $this->ravenClient->captureException($record['context']['context']);
+        if ($record['level'] == Logger::ERROR && isset($record['context']['exception'])) {
+            $this->ravenClient->captureException($record['context']['exception']);
         } else {
             $this->ravenClient->captureMessage(
                 $record['formatted']['message'],