Work around localhost exception issues in addUser helper

JAVA-1528