Alisha commit: Working on exceptions and non-TCP comments.