diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 7aea23cd..d9302276 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -120,11 +120,11 @@ module.exports = function(serverOptions) {
         onTileErrorStrategy = function onTileErrorStrategy$TimeoutTile(err, tile, headers, stats, format, callback) {
 
             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) {