Tolerate NULL interps
merge trunk. 
typo