3 files changed, 8 insertions, 3 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 280151c..a176f2c 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,7 +5,7 @@
  *
  */
 
-#define _VERSION     "1.1.69"
+#define _VERSION     "1.1.70"
 #define VERSION_DATE "22.06.2017"
 
 #define DB_API       4
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2017-06-22 version 1.1.70 (horchi)
+   - change: Fixed possible crash with unknown channels on wrong configuration
+
 2017-06-22 version 1.1.69 (horchi)
    - change: More rework of lock handling
 
diff --git a/Makefile b/Makefile
index c1030e8..5449ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -211,8 +211,10 @@ vcheck:
 push: vcheck
 	echo "tagging git with $(VERSION)"
 	git push
+	git push github master
 	git tag $(VERSION)
 	git push --tags
+	git push github master --tags
 
 commit: vcheck
 	git commit -m "$(LASTCOMMENT)" -a
diff --git a/update.c b/update.c
index 48fb523..a470992 100644
--- a/update.c
+++ b/update.c
@@ -1500,10 +1500,10 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries)
 
       // get channel and schedule of channel
 
-      if (channel = channels->GetByChannelID(channelId, true))
+      if (channelId && channel = channels->GetByChannelID(channelId, true))
          s = (cSchedule*)schedules->GetSchedule(channel, true);
       else
-         tell(0, "Error: Channel with ID '%s' don't exist on this VDR", (const char*)channelId.ToString());
+         tell(0, "Error: Channel with ID '%s' don't exist on this VDR", mapDb->getStrValue("ChannelId"));
 
       if (!schedules || !channels || !timers || !s)
       {