Removed nill-checks