Hotfix issue #18 (Crashlytics crash #7)

- Crash on NSNull
- This is just an crash hotfix, will probably need more sophisticated solution of the NSNull cause