devprop-4.21-rc1-2

Fix two potential NULL pointer dereferences found by Coverity in
the software nodes code introduced recently (Colin Ian King).