Fixed potential nil data crash
Merge pull request #67 from Kr1sso/patch-1

Fixed potential nil data crash