diff --git a/shutdownmanagers/awsmanager/aws.go b/shutdownmanagers/awsmanager/aws.go
index <HASH>..<HASH> 100644
--- a/shutdownmanagers/awsmanager/aws.go
+++ b/shutdownmanagers/awsmanager/aws.go
@@ -193,21 +193,23 @@ func (awsManager *AwsManager) handleMessage(message string) bool {
 		go awsManager.gs.StartShutdown(awsManager)
 		return true
 	} else if awsManager.config.Port != 0 {
-		awsManager.forwardMessage(hookMessage, message)
+		if err := awsManager.forwardMessage(hookMessage, message); err != nil {
+			awsManager.gs.ReportError(err)
+			return false
+		}
 		return true
 	}
 	return false
 }
 
-func (awsManager *AwsManager) forwardMessage(hookMessage *lifecycleHookMessage, message string) {
+func (awsManager *AwsManager) forwardMessage(hookMessage *lifecycleHookMessage, message string) error {
 	host, err := awsManager.api.GetHost(hookMessage.EC2InstanceId)
 	if err != nil {
-		awsManager.gs.ReportError(err)
-		return
+		return err
 	}
 
 	_, err = http.Post(fmt.Sprintf("http://%s:%d/", host, awsManager.config.Port), "application/json", strings.NewReader(message))
-	awsManager.gs.ReportError(err)
+	return err
 }
 
 // ShutdownStart calls Ping every pingTime
Do not delete sqs message from queue if http fails.