Added cleaner exception hierarchy