bugfix:
- fix invalid assert statement.
- fix deprecated NULL pointer macro.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>