Fixed NPe

Fixed NPe