Fixed NPEs in 2 net commands when testing w/ MockWorld