Fixing null conversion