Fixed NULL calendar objects