cs fixes & moving exception to controller