Oops: take 2 on that additional error handling.