I've merged the two PR so I'd consider the NPE specifically resolved, but please still try to get to the bottom of this. If it's a bug on our side, please open a new JIRA issue.