fixed typo
fixed npe