Narrowed exception handling a bit.  Makes me kind of nervous because the exceptions thrown are not documented.