allow terminators in conditionals. fix null dereference