diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 72bfe2f3c9..d81e5bd961 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -552,7 +552,7 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
 	}
 
 	my $schedule;
-	if (defined($alert->{'schedule'} && $alert->{'schedule'} != '')) {
+	if (defined($alert->{'schedule'}) && $alert->{'schedule'} ne '') {
 		$schedule = PandoraFMS::Tools::p_decode_json($pa_config, $alert->{'schedule'});
 	}
 
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index d01e760a32..f7cd712293 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -555,6 +555,7 @@ sub get_agentmodule_status_str($$$) {
 			FROM tagente_estado
 			WHERE id_agente_modulo = ?', $agent_module_id);
 	
+	return 'N/A' unless defined($status);
 	return 'Normal' if ($status == 0);
 	return 'Critical' if ($status == 1);
 	return 'Warning' if ($status == 2);