- Added null check for world