diff --git a/src/containers/error-boundary.jsx b/src/containers/error-boundary.jsx
index 7e8aa30e243579125974a1097b6b24d16dcd077b..2a84f4b9f38a37c7418847c975b16fec47fb4011 100644
--- a/src/containers/error-boundary.jsx
+++ b/src/containers/error-boundary.jsx
@@ -35,7 +35,16 @@ class ErrorBoundary extends React.Component {
             } else {
                 return <WebGlModalComponent onBack={this.handleBack} />;
             }
-            return <h1>Something went wrong.</h1>;
+            return (
+                <div style={{margin: '2rem'}}>
+                    <h1>Oops! Something went wrong.</h1>
+                    <p>
+                        We are so sorry, but it looks like Scratch has crashed. This bug has been
+                        automatically reported to the Scratch Team. Please refresh your page to try
+                        again.
+                    </p>
+                </div>
+            );
         }
         return this.props.children;
     }