Changes in exception.cc