Attempt to Solve null reference to system map #2

Vector.Zero also reintroduced as that wasn't the issue.