[PATCH] Fix GCC6 -Wnull-dereference warnings.