Fix crash
Merge pull request #174 from Icenium/fatme/fix-crash-with-device-name

Fix crash