Add better issue handling so we can track and capture exceptional circumstances