diff --git a/lib/cartodb/controllers/base.js b/lib/cartodb/controllers/base.js
index 98c5ee2f..f74702e9 100644
--- a/lib/cartodb/controllers/base.js
+++ b/lib/cartodb/controllers/base.js
@@ -301,11 +301,11 @@ function statusFromErrorMessage(errMsg) {
 }
 
 function isRenderTimeoutError (err) {
-    return err.message && (-1 !== err.message.indexOf('Render timed out'));
+    return err.message === 'Render timed out';
 }
 
 function isDatasourceTimeoutError (err) {
-    return err.message && (-1 !== err.message.indexOf('canceling statement due to statement timeout'));
+    return err.message && err.message.match(/canceling statement due to statement timeout/i);
 }
 
 function isTimeoutError (err) {