diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractCharSequenceDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractCharSequenceDecoder.java
index 129da247b039..1918d7182db9 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/AbstractCharSequenceDecoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/AbstractCharSequenceDecoder.java
@@ -175,14 +175,18 @@ private Collection<DataBuffer> processDataBuffer(DataBuffer buffer, DataBufferUt
 	public final T decode(DataBuffer dataBuffer, ResolvableType elementType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 
-		Charset charset = getCharset(mimeType);
-		T value = decodeInternal(dataBuffer, charset);
-		DataBufferUtils.release(dataBuffer);
-		LogFormatUtils.traceDebug(logger, traceOn -> {
-			String formatted = LogFormatUtils.formatValue(value, !traceOn);
-			return Hints.getLogPrefix(hints) + "Decoded " + formatted;
-		});
-		return value;
+		try {
+			Charset charset = getCharset(mimeType);
+			T value = decodeInternal(dataBuffer, charset);
+			LogFormatUtils.traceDebug(logger, traceOn -> {
+				String formatted = LogFormatUtils.formatValue(value, !traceOn);
+				return Hints.getLogPrefix(hints) + "Decoded " + formatted;
+			});
+			return value;
+		}
+		finally {
+			DataBufferUtils.release(dataBuffer);
+		}
 	}
 
 	private Charset getCharset(@Nullable MimeType mimeType) {
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java
index eaeac1b94104..1ac653333682 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java
@@ -35,4 +35,8 @@ public DataBufferLimitException(String message) {
 		super(message);
 	}
 
+	public DataBufferLimitException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java
index fc9bda027dcd..da376b14a1d8 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java
@@ -374,7 +374,12 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return this.byteBuf.toString();
+		try {
+			return this.byteBuf.toString();
+		}
+		catch (OutOfMemoryError ex) {
+			throw new DataBufferLimitException("Failed to convert data buffer to string: " + ex.getMessage(), ex);
+		}
 	}