Initialize sets to avoid NullPointerExceptions
Merge pull request #561 from LeovR/patch-5

Initialize sets to avoid NullPointerExceptions