Fix code paths not returning value.