diff --git a/ext/debug.c b/ext/debug.c
index 604d118b133..ed159649c87 100644
--- a/ext/debug.c
+++ b/ext/debug.c
@@ -1149,7 +1149,7 @@ PHP_METHOD(Phalcon_Debug, onUncaughtException){
 	phalcon_call_method(line, exception, "getline");
 	
 	link_format = zend_ini_string_ex(SS("xdebug.file_link_format"), 0, &ini_exists);
-	if (!link_format || !ini_exists) {
+	if (!link_format || !ini_exists || !strlen(link_format)) {
 		link_format = "file://%f#%l";
 	}
 
diff --git a/ext/tests/issue-1401.phpt b/ext/tests/issue-1401.phpt
index 2f9418ebba4..9a45514a513 100644
--- a/ext/tests/issue-1401.phpt
+++ b/ext/tests/issue-1401.phpt
@@ -2,6 +2,8 @@
 Phalcon\Debug and link to file with an error - https://github.com/phalcon/cphalcon/issues/1401
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+xdebug.file_link_format=file://%f#%l
 --FILE--
 <?php
 include('skipif.inc'); // This is to make sure the list of the included files is not empty
diff --git a/ext/tests/issue-680.phpt b/ext/tests/issue-680.phpt
index c185f5ba2ae..8a04d2d1658 100644
--- a/ext/tests/issue-680.phpt
+++ b/ext/tests/issue-680.phpt
@@ -2,6 +2,7 @@
 Implement getPut() - https://github.com/phalcon/cphalcon/issues/680
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+<?php if (!preg_match('/^cgi/', PHP_SAPI)) die('skip CGI SAPI is required'); ?>
 --PUT--
 string=hello&array[string]=world
 --FILE--