[WFLY-2666] Fixing NPE
Merge pull request #5624 from asoldano/WFLY-2666

[WFLY-2666] Fixing NPE
Merge branch 'redhat-master' into custom-master