Confluence thrown NPE if gadget contains underscore

2015-10-08 11:26:42,638 ERROR [http-nio-8588-exec-1] [atlassian.confluence.servlet.ConfluenceServletDispatcher] sendError Could not execute action
 -- referer: http://localhost:8588/c588/admin/viewgadgetdirectory.action | url: /c588/admin/addgadget.action | userName: admin
java.lang.NullPointerException
	at com.atlassian.confluence.plugins.gadgets.whitelist.ConfluenceURIWhitelist$3.apply(ConfluenceURIWhitelist.java:79)
	at com.atlassian.confluence.plugins.gadgets.whitelist.ConfluenceURIWhitelist$3.apply(ConfluenceURIWhitelist.java:75)
	at com.google.common.collect.Iterators.any(Iterators.java:685)
	at com.google.common.collect.Iterables.any(Iterables.java:620)
	at com.atlassian.confluence.plugins.gadgets.whitelist.ConfluenceURIWhitelist.matchesGadgetStoreHosts(ConfluenceURIWhitelist.java:38)
	at com.atlassian.confluence.plugins.gadgets.whitelist.ConfluenceURIWhitelist.allows(ConfluenceURIWhitelist.java:32)
	at sun.reflect.GeneratedMethodAccessor1275.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:497)
	at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:307)
	at org.springframework.osgi.service.importer.support.internal.aop.ServiceInvoker.doInvoke(ServiceInvoker.java:58)
	at org.springframework.osgi.service.importer.support.internal.aop.ServiceInvoker.invoke(ServiceInvoker.java:62)
	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171)
	at