Check that pickups aren't null before destroying them
Merge remote-tracking branch 'origin/master'