diff --git a/application/configs/application.ini.sample b/application/configs/application.ini.sample
index f83e1f46bfa92d603e7cd2cf95fdd62e43a2892f..86a301f7054f3e99feb291875655d46e41780da4 100644
--- a/application/configs/application.ini.sample
+++ b/application/configs/application.ini.sample
@@ -41,6 +41,7 @@ ldap.uri = "ldap://example.com"
 ldap.dn = "uid=user,dc=example,dc=com"
 ldap.password = "password"
 unl.errors.notifyEmails = ""
+unl.errors.showErrorsForIPs = ""
 resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
 resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
 resources.layout.layout = "unl_wdn"
diff --git a/application/modules/default/controllers/ErrorController.php b/application/modules/default/controllers/ErrorController.php
index a0015d72f26169092a1f4f1d641b0e4dae87c531..14e458be631761e0491c896393e46fe2a24c8f5b 100644
--- a/application/modules/default/controllers/ErrorController.php
+++ b/application/modules/default/controllers/ErrorController.php
@@ -22,7 +22,12 @@ class ErrorController extends Creq_Controller_Action {
             return;
         }
 
-        if ($_SERVER['REMOTE_ADDR'] == '129.93.23.68' || $_SERVER['REMOTE_ADDR'] == '129.93.17.83' || $_SERVER['REMOTE_ADDR'] == '129.93.239.115' || $_SERVER['REMOTE_ADDR'] == '127.0.0.1') {
+        $front = Zend_Controller_Front::getInstance();
+        $options = $front->getParam('bootstrap')->getOptions();
+        $emails = explode(",", $options['unl']['errors']['notifyEmails']);
+        $ips = explode(",", $options['unl']['errors']['showErrorsForIPs']);
+
+        if (in_array($_SERVER['REMOTE_ADDR'], $ips)) {
             header('Content-type: text/plain; charset=UTF-8');
             //Add a Unicode byte-order marker for Chrome
             echo chr(0xEF), chr(0xBB), chr(0xBF);
@@ -30,10 +35,6 @@ class ErrorController extends Creq_Controller_Action {
             exit;
         }
 
-        $front = Zend_Controller_Front::getInstance();
-        $options = $front->getParam('bootstrap')->getOptions();
-        $emails = explode(",", $options['unl']['errors']['notifyEmails']);
-
         $this->_sendEmail($emails);
         $this->view->exceptions = $this->_exceptions;
     }