improve address verification exception handling