added error check (John Fay)