fixed merge glitch that added errant except command