check for extraFields != null (fixed issue #1526)
check for extraFields != null (fixed issue #1526)

pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe