updating exceptions thrown to match