Merge "Fix bug 1028: Don't ignore exception in prepareInternalNetwork"