Added JMS groupid
Fixed NPE