diff --git a/common/image-fdt.c b/common/image-fdt.c
index 1d76bd60da843404d9dda64e4c5a93630e7ecb5e..8db3ccb4e7404b5b1f4f0bfca22998414157e0bc 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -413,11 +413,11 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 			}
 		} else {
 			debug("## No Flattened Device Tree\n");
-			goto error;
+			return 0;
 		}
 	} else {
 		debug("## No Flattened Device Tree\n");
-		goto error;
+		return 0;
 	}
 
 	*of_flat_tree = fdt_blob;