fixed null crash