Remove unnecessary NULL check

Fixes: #135
Add header for v0.8.18-head