Fix for 'carrierless' not being treated as NULL (bug 915803)