Fix for locationname = null