diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index 048c09119..3e819fa82 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -485,9 +485,9 @@ func startCDRS(internalCdrSChan chan *engine.CdrServer, logDb engine.LogStorage,
 }
 
 func startScheduler(internalSchedulerChan chan *scheduler.Scheduler, cacheDoneChan chan struct{}, ratingDb engine.RatingStorage, exitChan chan bool) {
-        // Wait for cache to load data before starting
-        cacheDone := <- cacheDoneChan
-        cacheDoneChan <- cacheDone
+	// Wait for cache to load data before starting
+	cacheDone := <-cacheDoneChan
+	cacheDoneChan <- cacheDone
 	utils.Logger.Info("Starting CGRateS Scheduler.")
 	sched := scheduler.NewScheduler()
 	go reloadSchedulerSingnalHandler(sched, ratingDb)
diff --git a/engine/storage_mongo.go b/engine/storage_mongo.go
index aa171baa3..5ea101224 100644
--- a/engine/storage_mongo.go
+++ b/engine/storage_mongo.go
@@ -955,7 +955,7 @@ func (ms *MongoStorage) GetLoadHistory(limit int, skipCache bool) (loadInsts []*
 		cache2go.RemKey(utils.LOADINST_KEY)
 		cache2go.Cache(utils.LOADINST_KEY, loadInsts)
 	}
-	return loadInsts, err
+	return loadInsts, nil
 }
 
 // Adds a single load instance to load history