Minor enhancements. Exceptions renaming.