diff --git a/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java b/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java
index 9d7bf3330f7aa11fd8992b9207e1efc73d22492e..64a901bcf6bb886b6ddb7b4b7b6a2015941d589e 100755
--- a/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java
+++ b/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java
@@ -233,9 +233,11 @@ public class MessagingBean {
         ForecastEvent toRed = em.find(ForecastEvent.class, ForecastEvent.TO_RED);
         ForecastEvent greenToYellow = em.find(ForecastEvent.class, ForecastEvent.GREEN_TO_YELLOW);
         ForecastEvent currentEvent = null;
+        Query findConfQ = em.createNamedQuery("ForecastResult.findByForecastConfigurationId", ForecastResult.class);
         for(ForecastConfiguration conf:forecastConfigurations)
         {
-            List<ForecastResult> results = em.createNamedQuery("ForecastResult.findByForecastConfigurationId", ForecastResult.class)
+            LOGGER.debug("Now working with forecastConfiguration with id=" + conf.getForecastConfigurationId());
+            List<ForecastResult> results = findConfQ
                     .setParameter("forecastConfigurationId", conf.getForecastConfigurationId())
                     .getResultList();
             
@@ -332,7 +334,12 @@ public class MessagingBean {
                 uMessage.addMessageLocalVersion(locale, headingTemplate, "",MessageFormat.format(bodyTemplate, templateParts),detailsUrl);
                 
             }
-            uMessage.setDistributionList(this.getForecastEventNotificationSubscribers(fConf));
+            List<MessageRecipient> distributionList = this.getForecastEventNotificationSubscribers(fConf);
+            if(distributionList == null || distributionList.isEmpty())
+            {
+                em.remove(newNotification);
+            }
+            uMessage.setDistributionList(distributionList);
             cal.setTime(systemTime);
             cal.add(Calendar.DATE, 1);
             uMessage.setExpiresAt(cal.getTime());
diff --git a/src/main/java/no/nibio/vips/logic/messaging/distribution/send/SmsMsgDeliveryHandler.java b/src/main/java/no/nibio/vips/logic/messaging/distribution/send/SmsMsgDeliveryHandler.java
index 74af3dfad8683e279f6b2b7737bceff9950cdde5..0236dd71e9afe22fc708106bdb621366652dc16c 100644
--- a/src/main/java/no/nibio/vips/logic/messaging/distribution/send/SmsMsgDeliveryHandler.java
+++ b/src/main/java/no/nibio/vips/logic/messaging/distribution/send/SmsMsgDeliveryHandler.java
@@ -139,6 +139,7 @@ public class SmsMsgDeliveryHandler implements IDeliveryMsgHandler {
                 + (vm.getIncludeNotificationSettingsLink() ? "\n\n" + MessageFormat.format(msgToSend.getNotificationSettingsLinkTpl(), msgReceiver.recipientId): "\n");
         LOGGER.debug(smsText);
         LOGGER.debug("Teksten er på " + smsText.length() + " tegn.");
+        LOGGER.debug("Mottaker: " + msgReceiver.msgDeliveryAddress);
 
         try {
             // TODO: Make the price part of VipsMessage