Fix a few null-problems