diff --git a/mtproto.go b/mtproto.go
index 55941ee4..0527be54 100755
--- a/mtproto.go
+++ b/mtproto.go
@@ -577,7 +577,11 @@ messageTypeSwitching:
 		m.Logger.Debug("RPC response: " + fmt.Sprintf("%T", obj))
 		err := m.writeRPCResponse(int(message.ReqMsgID), obj)
 		if err != nil {
-			return errors.Wrap(err, "writing RPC response")
+			if strings.Contains(err.Error(), "no response channel found") {
+				m.Logger.Error(errors.Wrap(err, "writing RPC response"))
+			} else {
+				return errors.Wrap(err, "writing RPC response")
+			}
 		}
 
 	case *objects.GzipPacked:
diff --git a/telegram/cache.go b/telegram/cache.go
index 2a5c5072..37908b43 100644
--- a/telegram/cache.go
+++ b/telegram/cache.go
@@ -71,8 +71,8 @@ func NewCache(logLevel string, fileN string) *CACHE {
 
 // --------- Cache file Functions ---------
 func (c *CACHE) WriteFile() {
-	//c.Lock()
-	//defer c.Unlock() // necessary?
+	c.Lock()
+	defer c.Unlock() // necessary?
 
 	if c.file == nil {
 		var err error