Fixed all NPEs
Merge pull request #104 from kezz101/localisation

Fixed errors in Localisation