diff --git a/src/App.js b/src/App.js
index 74e0bcbd6..5588d40ec 100644
--- a/src/App.js
+++ b/src/App.js
@@ -18,7 +18,6 @@ import {Server, Client} from './server.js';
 import * as reducers from './reducers.js';
 import React from 'react';
 import BugReporter from './fb-stubs/BugReporter.js';
-import ErrorReporter from './fb-stubs/ErrorReporter.js';
 import BugReporterDialog from './chrome/BugReporterDialog.js';
 import ErrorBar from './chrome/ErrorBar.js';
 import Logger from './fb-stubs/Logger.js';
@@ -75,14 +74,12 @@ export class App extends React.Component<Props, State> {
       server: this.initServer(),
     };
 
-    this.errorReporter = new ErrorReporter(this.logger.scribeLogger);
     this.bugReporter = new BugReporter(this.logger);
     this.commandLineArgs = yargs.parse(electron.remote.process.argv);
 
     setupMenu(this.sendKeyboardAction);
   }
 
-  errorReporter: ErrorReporter;
   bugReporter: BugReporter;
   logger: Logger;
   commandLineArgs: Object;
diff --git a/src/fb-stubs/ErrorReporter.js b/src/fb-stubs/ErrorReporter.js
index 330a43aab..2e075e4e2 100644
--- a/src/fb-stubs/ErrorReporter.js
+++ b/src/fb-stubs/ErrorReporter.js
@@ -5,6 +5,11 @@
  * @format
  */
 
+/*
+ * This class exists to allow error reporting to your own service.
+ * The recommended way to use this, is to instantiate it inside LogManager,
+ * so that all logged errors get reported to this class.
+ */
 export function cleanStack(stack: string, loc: ?string) {}
 import type ScribeLogger from './ScribeLogger';
 
diff --git a/src/server.js b/src/server.js
index cec54bf44..eeb62e9e1 100644
--- a/src/server.js
+++ b/src/server.js
@@ -171,11 +171,12 @@ export class Client extends EventEmitter {
     if (id == null) {
       const {error} = data;
       if (error != null) {
-        this.app.logger.error(error.stacktrace || error.message, 'deviceError');
-        this.app.errorReporter.report({
-          message: error.message,
-          stack: error.stacktrace,
-        });
+        this.app.logger.error(
+          `Error received from device ${
+            method ? `when calling ${method}` : ''
+          }: ${error.message} + \nDevice Stack Trace: ${error.stacktrace}`,
+          'deviceError',
+        );
       } else if (method === 'refreshPlugins') {
         this.refreshPlugins();
       } else if (method === 'execute') {