Minor changes of exceptions.