2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 1872c1a9..b3f7c17a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ ledger.so: python.cc libledger.la
 
 install-exec-hook:
 	CFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -L. -L.libs" \
-	    python setup.py install --install-base=$(DESTDIR) --root
+	    python setup.py install --prefix=$(prefix)
 
 endif
 
diff --git a/derive.cc b/derive.cc
index 6089c03a..f1c874c7 100644
--- a/derive.cc
+++ b/derive.cc
@@ -112,7 +112,7 @@ entry_t * derive_new_entry(journal_t& journal,
 
  done:
   if (! run_hooks(journal.entry_finalize_hooks, *added))
-    return NULL;
+    throw error("Failed to finalize derived entry (check commodities)");
 
   return added.release();
 }