Merge pull request #1019 from clebertsuconic/master

https://issues.jboss.org/browse/HORNETQ-1183 - fixing check up on startup