From bee64590612cec775766319d961e5b5a2cd31191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Tue, 14 Feb 2017 16:34:48 +0000
Subject: [PATCH 1/5] Improve exception handling in mobile main

---
 src/main.mobile.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.mobile.js b/src/main.mobile.js
index 5e3b558..e1064e2 100644
--- a/src/main.mobile.js
+++ b/src/main.mobile.js
@@ -26,15 +26,15 @@ class MeasurementWrapper extends React.Component {
   }
 
   render () {
-    if (!this.state.measurement) {
+    if (this.state.error !== null) {
       return <div className='container-fluid text-xs-center'>
-        <h2>Loading</h2>
+        <h2>Error in loading the measurement</h2>
+        <pre>{this.state.error.toString()}</pre>
       </div>
     }
-    if (this.state.error !== null) {
-      return <div>
-        <h2>Error in loading measurement</h2>
-        <pre>{this.state.error.toString()}</pre>
+    if (!this.state.measurement) {
+      return <div className='container-fluid text-xs-center'>
+        <h2>Loading</h2>
       </div>
     }
     return <div className='container-fluid'>

From 5a72dea316839ead7e03c27f952739c7707571c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Wed, 15 Feb 2017 13:50:17 +0000
Subject: [PATCH 2/5] Handle also errors in rendering the views

---
 src/main.mobile.js | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main.mobile.js b/src/main.mobile.js
index e1064e2..77c2c03 100644
--- a/src/main.mobile.js
+++ b/src/main.mobile.js
@@ -6,6 +6,22 @@ import './styles/core.mobile.scss'
 // ========================================================
 // Mobile specific wrapping
 // ========================================================
+
+const ErrorMessage = ({
+    error
+}) => {
+    return (
+      <div className='container-fluid text-xs-center'>
+        <h2>Error in loading the measurement</h2>
+        <pre>{error.toString()}</pre>
+      </div>
+    )
+}
+
+ErrorMessage.propTypes = {
+    error: React.PropTypes.object
+}
+
 class MeasurementWrapper extends React.Component {
   constructor (props) {
     super(props)
@@ -27,10 +43,7 @@ class MeasurementWrapper extends React.Component {
 
   render () {
     if (this.state.error !== null) {
-      return <div className='container-fluid text-xs-center'>
-        <h2>Error in loading the measurement</h2>
-        <pre>{this.state.error.toString()}</pre>
-      </div>
+      return <ErrorMessage error={this.state.error} />
     }
     if (!this.state.measurement) {
       return <div className='container-fluid text-xs-center'>
@@ -49,10 +62,17 @@ class MeasurementWrapper extends React.Component {
 const MOUNT_NODE = document.getElementById('root')
 
 let render = () => {
-  ReactDOM.render(
-    <MeasurementWrapper />,
-    MOUNT_NODE
-  )
+  try {
+    ReactDOM.render(
+      <MeasurementWrapper />,
+      MOUNT_NODE
+    )
+  } catch (error) {
+    ReactDOM.render(
+      <ErrorMessage error={error} />,
+      MOUNT_NODE
+    )
+  }
 }
 
 // ========================================================

From 6f0fb7e50dbc7c088a82e5eb74931801502eca66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Wed, 15 Feb 2017 14:08:14 +0000
Subject: [PATCH 3/5] Handle exceptions in a cleaner way

---
 src/main.mobile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.mobile.js b/src/main.mobile.js
index 77c2c03..aa8142c 100644
--- a/src/main.mobile.js
+++ b/src/main.mobile.js
@@ -12,8 +12,9 @@ const ErrorMessage = ({
 }) => {
     return (
       <div className='container-fluid text-xs-center'>
+        <i className='medium-icon fa fa-exclamation-triangle' aria-hidden="true" />
         <h2>Error in loading the measurement</h2>
-        <pre>{error.toString()}</pre>
+        <p>{error.toString()}</p>
       </div>
     )
 }

From cfa5817626dfbba6c1a7129d010edd693c03dea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Wed, 15 Feb 2017 14:15:22 +0000
Subject: [PATCH 4/5] Handle exceptions inside of Ndt test results

---
 src/routes/Measurements/components/nettests/Ndt.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/routes/Measurements/components/nettests/Ndt.js b/src/routes/Measurements/components/nettests/Ndt.js
index a5d6453..6a60d18 100644
--- a/src/routes/Measurements/components/nettests/Ndt.js
+++ b/src/routes/Measurements/components/nettests/Ndt.js
@@ -117,6 +117,16 @@ export class NdtDetails extends React.Component {
   render () {
     const { measurement } = this.props
 
+    if (measurement.test_keys.failure !== null) {
+      return (
+        <div>
+          <h2 className='result-warning'><i className='fa fa-exclamation-circle' /> Error in measurement</h2>
+          <p>We were not able to properly run the NDT test: <code>{measurement.test_keys.failure}</code></p>
+          <p>This usually happens when the NDT service is blocked by your ISP</p>
+        </div>
+      )
+    }
+
     return (
       <div>
         <div className='row'>

From 6035a4b8dea1eacfe44e7835990479171c1636a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Wed, 15 Feb 2017 14:18:36 +0000
Subject: [PATCH 5/5] Improve copy for NDT failure page

---
 src/routes/Measurements/components/nettests/Ndt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/Measurements/components/nettests/Ndt.js b/src/routes/Measurements/components/nettests/Ndt.js
index 6a60d18..8dd3fdb 100644
--- a/src/routes/Measurements/components/nettests/Ndt.js
+++ b/src/routes/Measurements/components/nettests/Ndt.js
@@ -122,7 +122,7 @@ export class NdtDetails extends React.Component {
         <div>
           <h2 className='result-warning'><i className='fa fa-exclamation-circle' /> Error in measurement</h2>
           <p>We were not able to properly run the NDT test: <code>{measurement.test_keys.failure}</code></p>
-          <p>This usually happens when the NDT service is blocked by your ISP</p>
+          <p>This usually happens when the port used by NDT is blocked by your ISP</p>
         </div>
       )
     }