fix NPE, remove error message for disk fix