Merge pull request #1029 from clebertsuconic/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=928760 - easy fix for NPE on soak test