Fixed NPE with issue_id