Add better issue handling.