narrowed some thrown exceptions