diff --git a/src/notifier/PokeNotificationSender.java b/src/notifier/PokeNotificationSender.java
index f7b95c3..ef7e3a6 100644
--- a/src/notifier/PokeNotificationSender.java
+++ b/src/notifier/PokeNotificationSender.java
@@ -38,9 +38,6 @@ private void notifyUser(final String userID, final Message message) {
         final User user = this.jda.getUserById(userID);
         final Thread thread = new Thread(new UserNotifier(user, message, false));
         thread.start();
-//
-//        UserNotifier notifier = new UserNotifier(user,message);
-//        notifier.run();
     }
 
     @Override
@@ -78,7 +75,9 @@ public void run() {
                     }
                 }else {
                     for (GeofenceIdentifier geofenceIdentifier : pokeSpawn.getGeofenceIds()) {
-                        for (PokeChannel channel : config.getPokeChannels(geofenceIdentifier)) {
+                        ArrayList<PokeChannel> channels = config.getPokeChannels(geofenceIdentifier);
+                        if(channels == null) continue;
+                        for (PokeChannel channel : channels) {
                             postToChannel(channel,pokeSpawn);
                         }
                     }