diff --git a/pandora/app/config.py b/pandora/app/config.py
index 7d158e4d..36dfdfe3 100644
--- a/pandora/app/config.py
+++ b/pandora/app/config.py
@@ -29,14 +29,18 @@ RUN_RELOADER = True
 NOTIFIER = None
 
 def get_version():
+    info = join(dirname(dirname(dirname(__file__))), '.bzr', 'branch', 'last-revision')
     git_dir = join(dirname(dirname(dirname(__file__))), '.git')
     if exists(git_dir):
         env = {'GIT_DIR': git_dir}
         cmd = ['git', 'rev-list', 'HEAD', '--count']
-        version = subprocess.check_output(cmd, env=env).strip().decode('utf-8')
-        if settings.VERSION_EPOCH:
-            version = settings.VERSION_EPOCH + version
-        return version
+        return subprocess.check_output(cmd, env=env).strip().decode('utf-8')
+    elif exists(info):
+        f = open(info)
+        rev = int(f.read().split()[0])
+        f.close()
+        if rev:
+            return u'%s' % rev
     else:
         return u'unknown'
 
diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index e9bd62a8..75d25de7 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -814,12 +814,8 @@ class Stream(models.Model):
 
         # file could have been moved while encoding
         # get current version from db and update
-        try:
-            self.refresh_from_db()
-        except archive.models.DoesNotExist:
-            pass
-        else:
-            self.update_status(ok, error)
+        self.refresh_from_db()
+        self.update_status(ok, error)
 
     def get_index(self):
         index = 1
diff --git a/pandora/settings.py b/pandora/settings.py
index fd1cf7a0..83dfb602 100644
--- a/pandora/settings.py
+++ b/pandora/settings.py
@@ -36,8 +36,6 @@ LANGUAGE_CODE = 'en-us'
 
 SITE_ID = 1
 
-VERSION_EPOCH = None
-
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True