Not sure I like the exception change here...