Smashing a sign removes it from config

also NPE fix
fix merge