fix potential access on 'None'
fix potential access on 'None'

bwaldvogel/openmoves,marguslt/openmoves,mourningsun75/openmoves,mourningsun75/openmoves,marguslt/openmoves,bwaldvogel/openmoves,marguslt/openmoves,mourningsun75/openmoves,bwaldvogel/openmoves