diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index 1daf03e076e..cc806c92a07 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,7 +135,14 @@ public class EmbeddedDatabaseFactory {
 
 		// Now populate the database
 		if (this.databasePopulator != null) {
-			populateDatabase();
+			try {
+				populateDatabase();
+			}
+			catch (RuntimeException ex) {
+				// failed to populate, so leave it as not initialized
+				shutdownDatabase();
+				throw ex;
+			}
 		}
 	}