Bugfix : prevent NPE in json mapping method