This one does have a NO_ERROR case that does what the else branch did previously.