From ea60a15e89d97bacd987e0b4c33dc4d6192ca229 Mon Sep 17 00:00:00 2001
From: Steinwagner <matthias.steinwagner@sap.com>
Date: Wed, 11 Dec 2019 11:58:09 +0100
Subject: [PATCH] Update TamagotchiService.java

---
 .../main/java/com/sap/tamagotchi/service/TamagotchiService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java
index 6665821..5f609de 100644
--- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java
+++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java
@@ -93,7 +93,7 @@ public class TamagotchiService {
     private void sendTamagotchiDefunctNotifiction(String id) {
 
         Device device = deviceRegistry.get(id);
-        if (device == null) {
+        if (device == null || device.getId() == null || device.getOwner() == null) {
             return;
         }
         String defunctMessage = String.format("Tamagotchi %s of %s passed away", device.getId(), device.getOwner());