Fixed 'NullPointer'