Fixing Null pointer exceptions on list location
Merge branch 'Victor' into Reza3
NOOOOO