Merge pull request #2152 from vlakoff/develop

Replace is_null() with === / !== NULL