CRAFTERCMS-76
NPE detected after cleanup