diff --git a/resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/RegistrationRequestProcessor.java b/resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/RegistrationRequestProcessor.java
index 680059c..ce67109 100644
--- a/resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/RegistrationRequestProcessor.java
+++ b/resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/RegistrationRequestProcessor.java
@@ -290,6 +290,20 @@ private void processResponse(@NonNull Map<String, Object> response) {
 			boolean doArchive = false;
 			Object obj = response.get("nodeInfo");
 			log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: {} {}", obj==null?null:obj.getClass().getTypeName(), obj);
+
+			// If device info are missing copy them from the registration request
+			if (obj==null || obj instanceof Map && ((Map) obj).isEmpty()) {
+				log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: ** NO DEVICE INFO IN RESPONSE **");
+				if (! registrationRequest.getDevice().getDeviceInfo().isEmpty()) {
+					obj = registrationRequest.getDevice().getDeviceInfo();
+					log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: ** DEVICE INFO COPIED FROM REGISTRATION REQUEST **");
+					log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: {}", obj);
+				} else {
+					log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: ** PROBLEM: REGISTRATION REQUEST DOES NOT CONTAIN DEVICE INFO EITHER **");
+				}
+			}
+			log.warn("RegistrationRequestProcessor: processResponse: CHECK: ** NOT A REAL EXCEPTION **\n", new RuntimeException("NOT A REAL EXCEPTION"));
+
 			if (obj instanceof Map devInfo) {
 				// Update request info
 				registrationRequest.setLastUpdateDate(Instant.ofEpochMilli(timestamp));