2 files changed, 8 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 8f46bf7..538c4a0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -37,3 +37,5 @@ Version 0.0.5
 - introduced possibility to ignore titles, set scrap 
   type and substitute search strings manually. See file 
   "conf/override.conf" in source tree for explanation.
+- Fixed a crash if a recording without EPG is running
+- Fixed a crash if internet connection is not available
diff --git a/worker.c b/worker.c
index 2c852fb..c5d83f6 100644
--- a/worker.c
+++ b/worker.c
@@ -97,6 +97,8 @@ bool cTVScraperWorker::ConnectScrapers(void) {
         moviedbScraper = new cMovieDBScraper(movieDir, db, language, overrides);
         if (!moviedbScraper->Connect()) {
             esyslog("tvscraper: ERROR, connection to TheMovieDB failed");
+            delete moviedbScraper;
+            moviedbScraper = NULL;
             return false;
         }
     }
@@ -104,6 +106,8 @@ bool cTVScraperWorker::ConnectScrapers(void) {
         tvdbScraper = new cTVDBScraper(seriesDir, db, language, overrides);
         if (!tvdbScraper->Connect()) {
             esyslog("tvscraper: ERROR, connection to TheTVDB failed");
+            delete tvdbScraper;
+            tvdbScraper = NULL;
             return false;
         }
     }
@@ -186,8 +190,8 @@ void cTVScraperWorker::CheckRunningTimers(void) {
         if (timer->Recording()) {
             const cEvent *event = timer->Event();
             if (!event)
-	    	continue;
-	    scrapType type = GetScrapType(event);
+                continue;
+            scrapType type = GetScrapType(event);
             if (type == scrapSeries) {
                 if (!db->SetRecordingSeries((int)event->EventID())) {
                     if (ConnectScrapers()) {