Making bin/nopw more robust.