diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsErrorHandler.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsErrorHandler.java
new file mode 100644
index 0000000000..220b2744f3
--- /dev/null
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsErrorHandler.java
@@ -0,0 +1,17 @@
+package com.baeldung.spring.jms;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ErrorHandler;
+
+public class SampleJmsErrorHandler implements ErrorHandler {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SampleJmsErrorHandler.class);
+
+    @Override
+    public void handleError(Throwable t) {
+        LOG.warn("In default jms error handler...");
+        LOG.error("Error Message : {}", t.getMessage());
+    }
+
+}
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
index 927762f05b..d3f09618fb 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
@@ -26,4 +26,8 @@ public class SampleJmsMessageSender {
     public void sendMessage(final Employee employee) {
         this.jmsTemplate.convertAndSend(employee);
     }
+
+    public void sendTextMessage(String msg) {
+        this.jmsTemplate.send(queue, s -> s.createTextMessage(msg));
+    }
 }
diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
index f35c22e144..87627c47e7 100644
--- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
@@ -27,6 +27,9 @@ public class SampleListener implements MessageListener {
             try {
                 String msg = ((TextMessage) message).getText();
                 System.out.println("Received message: " + msg);
+                if (msg == null) {
+                    throw new IllegalArgumentException("Null value received...");
+                }
             } catch (JMSException ex) {
                 throw new RuntimeException(ex);
             }
@@ -37,4 +40,5 @@ public class SampleListener implements MessageListener {
         Map map = (Map) this.jmsTemplate.receiveAndConvert();
         return new Employee((String) map.get("name"), (Integer) map.get("age"));
     }
+
 }
diff --git a/spring-jms/src/main/resources/applicationContext.xml b/spring-jms/src/main/resources/applicationContext.xml
index 28bf848e59..97a90e0bf2 100644
--- a/spring-jms/src/main/resources/applicationContext.xml
+++ b/spring-jms/src/main/resources/applicationContext.xml
@@ -1,51 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
-	<!-- JmsTemplate Definition -->
-	<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-		<property name="connectionFactory" ref="connectionFactory" />
-		<property name="defaultDestination" ref="destinationQueue" />
-		<property name="messageConverter" ref="myMessageConverter" />
-	</bean>
-	<bean id="amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-		<constructor-arg index="0" value="tcp://localhost:61616" />
-	</bean>
+    <!-- JmsTemplate Definition -->
+    <bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+        <property name="connectionFactory" ref="connectionFactory" />
+        <property name="defaultDestination" ref="destinationQueue" />
+        <property name="messageConverter" ref="myMessageConverter" />
+    </bean>
 
-	<!-- ConnectionFactory Definition -->
-	<bean id="connectionFactory"
-		class="org.springframework.jms.connection.SingleConnectionFactory">
-		<constructor-arg ref="amqConnectionFactory" />
+    <bean id="amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+        <constructor-arg index="0" value="tcp://localhost:61616" />
+    </bean>
 
-	</bean>
+    <!-- ConnectionFactory Definition -->
+    <bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
+        <constructor-arg ref="amqConnectionFactory" />
+    </bean>
 
+    <bean id="destinationQueue" class="org.apache.activemq.command.ActiveMQQueue">
+        <constructor-arg index="0" value="IN_QUEUE" />
+    </bean>
 
-	<bean id="destinationQueue" class="org.apache.activemq.command.ActiveMQQueue">
-		<constructor-arg index="0" value="IN_QUEUE" />
-	</bean>
+    <bean id="SampleJmsMessageSender" class="com.baeldung.spring.jms.SampleJmsMessageSender">
+        <property name="queue" ref="destinationQueue" />
+        <property name="jmsTemplate" ref="jmsTemplate" />
+    </bean>
 
+    <bean id="myMessageConverter" class="com.baeldung.spring.jms.SampleMessageConverter" />
 
-	<bean id="SampleJmsMessageSender" class="com.baeldung.spring.jms.SampleJmsMessageSender">
-		<property name="queue" ref="destinationQueue" />
-		<property name="jmsTemplate" ref="jmsTemplate" />
-	</bean>
+    <!-- this is the Message-Driven POJO (MDP) -->
+    <bean id="messageListener" class="com.baeldung.spring.jms.SampleListener">
+        <property name="jmsTemplate" ref="jmsTemplate" />
+        <property name="queue" ref="destinationQueue" />
+    </bean>
 
-	<bean id="myMessageConverter" class="com.baeldung.spring.jms.SampleMessageConverter" />
+    <bean id="errorHandler" class="com.baeldung.spring.jms.SampleJmsErrorHandler" />
 
-	<!-- this is the Message-Driven POJO (MDP) -->
-	<bean id="messageListener" class="com.baeldung.spring.jms.SampleListener">
-		<property name="jmsTemplate" ref="jmsTemplate" />
-		<property name="queue" ref="destinationQueue" />
-	</bean>
-
-
-	<!-- and this is the message listener container -->
-	<bean id="jmsContainer"
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer">
-		<property name="connectionFactory" ref="connectionFactory" />
-		<property name="destinationName" value="IN_QUEUE" />
-		<property name="messageListener" ref="messageListener" />
-	</bean>
+    <!-- and this is the message listener container -->
+    <bean id="jmsContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
+        <property name="connectionFactory" ref="connectionFactory" />
+        <property name="destinationName" value="IN_QUEUE" />
+        <property name="messageListener" ref="messageListener" />
+        <property name="errorHandler" ref="errorHandler" />
+    </bean>
 </beans>
diff --git a/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java
index f87d26b144..f23ead4d69 100644
--- a/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java
+++ b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java
@@ -8,12 +8,14 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class DefaultTextMessageSenderIntegrationTest {
 
     private static SampleJmsMessageSender messageProducer;
+    private static SampleListener messageListener;
 
     @SuppressWarnings("resource")
     @BeforeClass
     public static void setUp() {
         ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml");
         messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender");
+        messageListener = (SampleListener) applicationContext.getBean("messageListener");
     }
 
     @Test
@@ -21,4 +23,9 @@ public class DefaultTextMessageSenderIntegrationTest {
         messageProducer.simpleSend();
     }
 
+    @Test
+    public void testSendTextMessage() {
+        messageProducer.sendTextMessage(null);
+    }
+
 }