added author info and narrowed exception cathing a bit