Changed from try..catch to something more sane.