diff --git a/src/core/friendly_errors/browser_errors.js b/src/core/friendly_errors/browser_errors.js
index 6abdc4a4b3..1ab7784e4e 100644
--- a/src/core/friendly_errors/browser_errors.js
+++ b/src/core/friendly_errors/browser_errors.js
@@ -91,7 +91,7 @@ const strings = {
       browser: 'all'
     },
     {
-      msg: "Cannot read property '{{.}}' of null",
+      msg: 'Cannot read {{.}} null',
       type: 'READNULL',
       browser: 'Chrome'
     },
@@ -101,7 +101,7 @@ const strings = {
       browser: 'Firefox'
     },
     {
-      msg: "Cannot read property '{{.}}' of undefined",
+      msg: 'Cannot read {{.}} undefined',
       type: 'READUDEFINED',
       browser: 'Chrome'
     },
diff --git a/test/unit/utilities/time_date.js b/test/unit/utilities/time_date.js
index 4ded1b7afe..df95c29847 100644
--- a/test/unit/utilities/time_date.js
+++ b/test/unit/utilities/time_date.js
@@ -110,7 +110,7 @@ suite('time and date', function() {
       var runningTime = 50;
       var init_date = window.performance.now();
       // wait :\
-      while (window.performance.now() - init_date < runningTime) {
+      while (window.performance.now() - init_date <= runningTime) {
         /* no-op */
       }
       assert.operator(myp5.millis(), '>', runningTime, 'everything is ok');
@@ -121,7 +121,7 @@ suite('time and date', function() {
       var init_date = Date.now();
       var result = myp5.millis();
       // wait :\
-      while (Date.now() - init_date < runningTime) {
+      while (Date.now() - init_date <= runningTime) {
         /* no-op */
       }
       var newResult = myp5.millis();