Fixed implicit conversion to NULL warnings
Merge pull request #1272 from van51/develop

Fixed travis warnings for implicit conversion from NULL to bool