Aaron and Jen in class work time

Fixed some bug crashes due to empty dictionaries.