Fix calendar errors

www/common/outer/calendar.js

@@ -554,6 +554,10 @@ ctx.calendars[channel] = {
                 return void cb({error: err.error});
             }
             // Add the calendar and call back
+            // Wait for the metadata to be stored (channel fully ready) before adding it
+            // to our store
+            var ctxCal = ctx.calendars[cal.channel];
+            Realtime.whenRealtimeSyncs(ctxCal.lm.realtime, function () {
                 c[cal.channel] = cal;
                 var pin = store.pin || ctx.pinPads;
                 pin([cal.channel], function (res) {
@@ -561,6 +565,7 @@ ctx.calendars[channel] = {
                 });
                 ctx.Store.onSync(store.id, cb);
             });
+        });
     };
     var updateCalendar = function (ctx, data, cId, cb) {
         var id = data.id;
@@ -635,7 +640,8 @@ ctx.calendars[channel] = {
         var newC;
         if (changes.calendarId) {
             newC = ctx.calendars[changes.calendarId];
-            if (!newC || !newC.proxy || !newC.proxy.content) { return void cb({error: "ENOENT"}); }
+            if (!newC || !newC.proxy) { return void cb({error: "ENOENT"}); }
+            newC.proxy.content = newC.proxy.content || {};
         }
 
         Object.keys(changes).forEach(function (key) {