diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/PersistenceConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/PersistenceConfig.java
new file mode 100644
index 0000000000..0d6fa738f4
--- /dev/null
+++ b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/spring/PersistenceConfig.java
@@ -0,0 +1,79 @@
+package org.baeldung.ex.mappingexception.spring;
+
+import java.util.Properties;
+
+import javax.sql.DataSource;
+
+import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.orm.hibernate4.HibernateTransactionManager;
+import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.google.common.base.Preconditions;
+
+@Configuration
+@EnableTransactionManagement
+@PropertySource({ "classpath:persistence-mysql.properties" })
+@ComponentScan({ "org.baeldung.persistence" })
+public class PersistenceConfig {
+
+    @Autowired
+    private Environment env;
+
+    public PersistenceConfig() {
+        super();
+    }
+
+    @Bean
+    public LocalSessionFactoryBean sessionFactory() {
+        final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
+        sessionFactory.setDataSource(restDataSource());
+        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model2" });
+        sessionFactory.setHibernateProperties(hibernateProperties());
+
+        return sessionFactory;
+    }
+
+    @Bean
+    public DataSource restDataSource() {
+        final BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public HibernateTransactionManager transactionManager() {
+        final HibernateTransactionManager txManager = new HibernateTransactionManager();
+        txManager.setSessionFactory(sessionFactory().getObject());
+
+        return txManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    final Properties hibernateProperties() {
+        return new Properties() {
+            {
+                setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+                setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+
+                // setProperty("hibernate.globally_quoted_identifiers", "true");
+                // note: necessary in launchpad-storage, but causing problems here
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/spring-exceptions/src/main/resources/persistence-mysql.properties b/spring-exceptions/src/main/resources/persistence-mysql.properties
index 04a62f6c6a..af56ce1bf8 100644
--- a/spring-exceptions/src/main/resources/persistence-mysql.properties
+++ b/spring-exceptions/src/main/resources/persistence-mysql.properties
@@ -7,4 +7,4 @@ jdbc.pass=tutorialmy5ql
 # hibernate.X
 hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 hibernate.show_sql=false
-hibernate.hbm2ddl.auto=create-drop
+hibernate.hbm2ddl.auto=create
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/MappingExceptionIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/MappingExceptionIntegrationTest.java
new file mode 100644
index 0000000000..47f519e211
--- /dev/null
+++ b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/MappingExceptionIntegrationTest.java
@@ -0,0 +1,29 @@
+package org.baeldung.ex.mappingexception;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import org.baeldung.ex.mappingexception.spring.PersistenceConfig;
+import org.baeldung.persistence.model.Foo;
+import org.baeldung.persistence.service.IFooService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class MappingExceptionIntegrationTest {
+
+    @Autowired
+    private IFooService fooService;
+
+    // tests
+
+    @Test
+    public final void givenEntityIsPersisted_thenException() {
+        fooService.create(new Foo(randomAlphabetic(6)));
+    }
+
+}