gistfile1.txt

     /**
      * delete the consumer.
-     * @param uuid uuid of the consumer to delete.
+     * 
+     * @param uuid
+     *            uuid of the consumer to delete.
      */
     @DELETE
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@@ -210,70 +225,92 @@ public class ConsumerResource {
     public void deleteConsumer(@PathParam("consumer_uuid") String uuid) {
         log.debug("deleteing  consumer_uuid" + uuid);
         try {
-            consumerCurator.delete(consumerCurator.lookupByUuid(uuid));
+            Consumer toDelete = consumerCurator.lookupByUuid(uuid);
+            if (toDelete == null)
+                return;
+
+            ConsumerIdentityCertificate certificate = consumerIdentityCertificateCurator
+                .find(toDelete.getId());
+            if (certificate != null) {
+                consumerIdentityCertificateCurator.delete(certificate);
+            }
+            consumerCurator.delete(toDelete);
         }
         catch (RuntimeException e) {
             throw new NotFoundException(e.getMessage());
         }
     }