Fixed UNAVOIDABLE NPE