Improving null safety