Improved null-safety