Fixing some nil comparaisons errors.
Merge pull request #13 from Aymenworks/master

Fixing some nil comparisons errors for Xcode Beta 6