FORUM-606 | Fix problem of NullPointerException when stop server
Merge commit '038979206c9d8eb2f688573d029802dc8ad71ee9' into HEAD