fixed null err