Changed raise for "better" style