- Added more Null annotations and fixed some null problems.