NPE fix

I did the modification you suggested. There is a little issue with the indentation: I am almost sure I am using the one suggested by the infinispan team, though