Updated error checking for calendar
Merge remote-tracking branch 'origin/master'

Conflicts:
Revert "Updated error checking for calendar"

This reverts commit 0056a3c86f73642dbed197c7b71b2ce29c9c2a5f.