#JC-1254 Fixed NullPointerException.