Nullfixes

Just a few null fixes.