diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 31550e3b33..114718ca6e 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -652,15 +652,18 @@ sub logger ($$;$) {
 	} else {
 		# Obtain the script that invoke this log
 		my $parent_caller = "";
-		if (($parent_caller = ( caller(2) )[1]) ne "") {
+		$parent_caller = ( caller(2) )[1];
+		if (defined $parent_caller) {
 			$parent_caller = (split '/', $parent_caller)[-1];
 			$parent_caller =~ s/\.[^.]+$//;
-			$parent_caller = " ** " . $parent_caller . " **:";
+			$parent_caller = " ** " . $parent_caller . " **: ";
+		} else {
+			$parent_caller = " ";
 		}
 		open (FILE, ">> $file") or die "[FATAL] Could not open logfile '$file'";
 		# Get an exclusive lock on the file (LOCK_EX)
 		flock (FILE, 2);
-		print FILE strftime ("%Y-%m-%d %H:%M:%S", localtime()) . $parent_caller . " " . (defined($pa_config->{'servername'}) ? $pa_config->{'servername'} : '') . " [V". $level ."] " . $message . "\n";
+		print FILE strftime ("%Y-%m-%d %H:%M:%S", localtime()) . $parent_caller . (defined($pa_config->{'servername'}) ? $pa_config->{'servername'} : '') . " [V". $level ."] " . $message . "\n";
 		close (FILE);
 	}
 }