diff --git a/script/development b/script/development
index eb4a3ac..0fee191 100755
--- a/script/development
+++ b/script/development
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 export RAILS_ENV=development
 
 stop() {
@@ -9,6 +11,7 @@ stop() {
 }
 
 start() {
+  rake db:abort_if_pending_migrations
   ./script/feed-updater start
   ./script/delayed_job start
   trap stop INT TERM
--
libgit2 0.21.2