added additional error handling