+ Fixed scanner exception