diff --git a/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py b/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py
index bfbea380e..a7942b7d4 100644
--- a/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py
+++ b/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py
@@ -13,18 +13,25 @@ down_revision = '14fe12ade3df'
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import mysql
+from sqlalchemy.exc import InternalError
 
 def upgrade(tables):
     ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(u'fk_logentry_access_token_id_accesstoken', 'logentry', type_='foreignkey')
-    op.drop_index('logentry_access_token_id', table_name='logentry')
-    op.drop_column('logentry', 'access_token_id')
+    try:
+        op.drop_constraint(u'fk_logentry_access_token_id_accesstoken', 'logentry', type_='foreignkey')
+        op.drop_index('logentry_access_token_id', table_name='logentry')
+        op.drop_column('logentry', 'access_token_id')
+    except InternalError:
+        pass
     ### end Alembic commands ###
 
 
 def downgrade(tables):
     ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('logentry', sa.Column('access_token_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
-    op.create_foreign_key(u'fk_logentry_access_token_id_accesstoken', 'logentry', 'accesstoken', ['access_token_id'], ['id'])
-    op.create_index('logentry_access_token_id', 'logentry', ['access_token_id'], unique=False)
+    try:
+        op.add_column('logentry', sa.Column('access_token_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
+        op.create_foreign_key(u'fk_logentry_access_token_id_accesstoken', 'logentry', 'accesstoken', ['access_token_id'], ['id'])
+        op.create_index('logentry_access_token_id', 'logentry', ['access_token_id'], unique=False)
+    except InternalError:
+        pass
     ### end Alembic commands ###