unless except.blank? is pointless now, remove this check