avoid NPE
cleanup
change triggers processing pipe
test more