Exercise fixes

Safety fixes for Exercise class.