FELIX-609 Fixed the issue as suggested in the description. If the user node is invalid, a new node will be returned.