diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 87e94cbe7d..13f80233ee 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1250,7 +1250,7 @@ public class MessageDatabase extends ServiceSupport implements BrokerServiceAwar
         oout.writeObject(metadata.producerSequenceIdTracker);
         oout.flush();
         oout.close();
-        return store(new KahaProducerAuditCommand().setAudit(new Buffer(baos.toByteArray())));
+        return store(new KahaProducerAuditCommand().setAudit(new Buffer(baos.toByteArray())), true, null, null);
     }
 
     public HashSet<Integer> getJournalFilesBeingReplicated() {
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java b/activemq-core/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java
new file mode 100644
index 0000000000..3e7b5d6e10
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/store/kahadb/NoSpaceIOTest.java
@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.store.kahadb;
+
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class NoSpaceIOTest {
+    private static final Log LOG = LogFactory.getLog(NoSpaceIOTest.class);
+
+    // handy way to validate some out of space related errors with a usb key
+    // allow it to run out of space, delete toDelete and see it recover
+    @Ignore("needs small volume, like usb key") @Test
+    public void testRunOutOfSpace() throws Exception {
+        BrokerService broker = new BrokerService();
+        File dataDir = new File("/Volumes/NO NAME/");
+        File useUpSpace = new File(dataDir, "bigFile");
+        if (!useUpSpace.exists()) {
+            RandomAccessFile filler = new RandomAccessFile(useUpSpace, "rw");
+            filler.setLength(1024*1024*1412); // use ~1.5G of 2G (usb) volume
+            File toDelete = new File(dataDir, "toDelete");
+            filler = new RandomAccessFile(toDelete, "rw");
+            filler.setLength(1024*1024*32*10); // 10 data files
+        }
+        broker.setDataDirectoryFile(dataDir);
+        broker.start();
+        AtomicLong consumed = new AtomicLong(0);
+        consume(consumed);
+        LOG.info("consumed: " + consumed);
+
+        broker.getPersistenceAdapter().checkpoint(true);
+
+        AtomicLong sent = new AtomicLong(0);
+        try {
+            produce(sent, 100);
+        } catch (Exception expected) {
+            LOG.info("got ex, sent: " + sent);
+        }
+        LOG.info("sent: " + sent);
+    }
+
+    private void consume(AtomicLong consumed) throws JMSException {
+        Connection c = new ActiveMQConnectionFactory("vm://localhost").createConnection();
+        c.start();
+        Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        MessageConsumer consumer = s.createConsumer(new ActiveMQQueue("t"));
+        while (consumer.receive(2000) != null) {
+            consumed.incrementAndGet();
+        }
+    }
+
+    private void produce(AtomicLong sent, long toSend) throws JMSException {
+        Connection c = new ActiveMQConnectionFactory("vm://localhost").createConnection();
+        c.start();
+        Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        MessageProducer producer = s.createProducer(new ActiveMQQueue("t"));
+        TextMessage m = s.createTextMessage();
+        m.setText(String.valueOf(new char[1024*1024]));
+        for (int i=0; i<toSend; i++) {
+            producer.send(m);
+            sent.incrementAndGet();
+        }
+    }
+}
diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java b/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
index d4de60f4ce..922601970f 100644
--- a/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
+++ b/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
@@ -139,8 +139,6 @@ class DataFileAppender {
 
     /**
      * Construct a Store writer
-     * 
-     * @param fileId
      */
     public DataFileAppender(Journal dataManager) {
         this.journal = dataManager;
@@ -148,17 +146,6 @@ class DataFileAppender {
         this.maxWriteBatchSize = this.journal.getWriteBatchSize();
     }
 
-    /**
-     * @param type
-     * @param marshaller
-     * @param payload
-     * @param type
-     * @param sync
-     * @return
-     * @throws IOException
-     * @throws
-     * @throws
-     */
     public Location storeItem(ByteSequence data, byte type, boolean sync) throws IOException {
     	
         // Write the packet our internal buffer.
@@ -423,12 +410,12 @@ class DataFileAppender {
             synchronized (enqueueMutex) {
                 firstAsyncException = e;
                 if (wb != null) {
-                    wb.latch.countDown();
                     wb.exception.set(e);
+                    wb.latch.countDown();
                 }
                 if (nextWriteBatch != null) {
-            	    nextWriteBatch.latch.countDown();
-            	    nextWriteBatch.exception.set(e);
+                    nextWriteBatch.exception.set(e);
+                    nextWriteBatch.latch.countDown();
                 }
             }
         } catch (InterruptedException e) {
diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java b/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
index 4cb0772ad1..e368b4d150 100644
--- a/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
+++ b/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
@@ -158,6 +158,11 @@ public class Journal {
             List<DataFile> l = new ArrayList<DataFile>(fileMap.values());
             Collections.sort(l);
             for (DataFile df : l) {
+                if (df.getLength() == 0) {
+                    // possibly the result of a previous failed write
+                    LOG.info("ignoring zero length, partially initialised journal data file: " + df);
+                    continue;
+                }
                 dataFiles.addLast(df);
                 fileByFileMap.put(df.getFile(), df);