Working on adding exceptions