diff --git a/Gemfile b/Gemfile
index c86556c..4e77372 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,46 +1,47 @@
 source 'https://rubygems.org'
 
 group :development, :test do
   gem 'pry-byebug'
 end
 
 group :development do
   gem 'rubocop', '0.35', require: false
   gem 'guard-minitest', require: false
   gem 'guard', require: false
   gem 'capistrano', '3.2.1', require: false # pkg:capistrano
 end
 
 # Lock jessie versions
 #
 
+gem 'sentry-raven', '2.3.0'
 gem 'rails', '4.1.8'
 gem 'i18n', '0.6.9'
 gem 'json', '1.8.1'
 gem 'mail', '2.6.1'
 gem 'mime-types', '1.25'
 gem 'minitest', '5.4.2'
 gem 'rack', '1.5.2'
 gem 'rack-test', '0.6.2'
 gem 'rake', '10.3.2'
 gem 'sprockets', '2.12.3'
 gem 'sprockets-rails', '2.1.3'
 gem 'thread_safe', '0.3.3'
 gem 'tzinfo', '1.1.0'
 
 gem 'mysql2', '0.3.16'
 gem 'jquery-rails', '3.1.2'
 gem 'warden', '1.2.3'
 gem 'oauth2', '0.9.3'
 
 gem 'net-scp', '1.2.1'
 gem 'state_machine', '1.2.0'
 
 gem 'kaminari', '0.16.1'
 gem 'redcarpet', '3.1.2'
 
 group :test do
   gem 'factory_girl_rails', '4.4.1' # pkg:ruby-factory-girl-rails
   gem 'rspec-rails', '2.14.2'
   gem 'database_cleaner', '1.3.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 0880b9f..8c2b56f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,213 +1,216 @@
 GEM
   remote: https://rubygems.org/
   specs:
     actionmailer (4.1.8)
       actionpack (= 4.1.8)
       actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
     actionpack (4.1.8)
       actionview (= 4.1.8)
       activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionview (4.1.8)
       activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     activemodel (4.1.8)
       activesupport (= 4.1.8)
       builder (~> 3.1)
     activerecord (4.1.8)
       activemodel (= 4.1.8)
       activesupport (= 4.1.8)
       arel (~> 5.0.0)
     activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
     builder (3.2.2)
     byebug (8.0.0)
     capistrano (3.2.1)
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
     coderay (1.1.0)
     colorize (0.7.7)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     formatador (0.2.5)
     guard (2.13.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-minitest (2.4.4)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
     hike (1.2.3)
     i18n (0.6.9)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     jwt (0.1.13)
       multi_json (>= 1.5)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25)
     minitest (5.4.2)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.16)
     nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.1)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
     oauth2 (0.9.3)
       faraday (>= 0.8, < 0.10)
       jwt (~> 0.1.8)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rails (4.1.8)
       actionmailer (= 4.1.8)
       actionpack (= 4.1.8)
       actionview (= 4.1.8)
       activemodel (= 4.1.8)
       activerecord (= 4.1.8)
       activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.8)
       sprockets-rails (~> 2.0)
     railties (4.1.8)
       actionpack (= 4.1.8)
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.3.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     rspec-rails (2.14.2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rubocop (0.35.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.3.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
     ruby-progressbar (1.7.5)
+    sentry-raven (2.3.0)
+      faraday (>= 0.7.6, < 1.0)
     shellany (0.0.1)
     slop (3.6.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sshkit (1.7.1)
       colorize (>= 0.7.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     state_machine (1.2.0)
     thor (0.19.1)
     thread_safe (0.3.3)
     tilt (1.4.1)
     tzinfo (1.1.0)
       thread_safe (~> 0.1)
     warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   capistrano (= 3.2.1)
   database_cleaner (= 1.3.0)
   factory_girl_rails (= 4.4.1)
   guard
   guard-minitest
   i18n (= 0.6.9)
   jquery-rails (= 3.1.2)
   json (= 1.8.1)
   kaminari (= 0.16.1)
   mail (= 2.6.1)
   mime-types (= 1.25)
   minitest (= 5.4.2)
   mysql2 (= 0.3.16)
   net-scp (= 1.2.1)
   oauth2 (= 0.9.3)
   pry-byebug
   rack (= 1.5.2)
   rack-test (= 0.6.2)
   rails (= 4.1.8)
   rake (= 10.3.2)
   redcarpet (= 3.1.2)
   rspec-rails (= 2.14.2)
   rubocop (= 0.35)
+  sentry-raven (= 2.3.0)
   sprockets (= 2.12.3)
   sprockets-rails (= 2.1.3)
   state_machine (= 1.2.0)
   thread_safe (= 0.3.3)
   tzinfo (= 1.1.0)
   warden (= 1.2.3)
diff --git a/config/application.rb b/config/application.rb
index 5e82071..a1b0a9f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,57 +1,63 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
 # Production doesn't use bundler
 # you've limited to :test, :development, or :production.
 if ENV['RAILS_ENV'] != 'production'
   Bundler.require(*Rails.groups)
 else
   # Dependencies to load before starting rails in production
   require 'kaminari'
   require 'jquery-rails'
   require 'state_machine'
   require 'beaneater'
   require 'oauth2'
   require 'warden'
   require 'net/scp'
   require 'redcarpet'
+  require 'raven'
 end
 
 module Archiving
   def self.settings opts = nil
     @settings ||= {}
 
     return @settings if opts.nil?
     @settings.merge! opts
     @settings
   end
 
   def self.markdown
     @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
   end
 
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
     # Store/Read localtime from the database
     config.time_zone = 'Athens'
     config.active_record.default_timezone = :local
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.autoload_paths << Rails.root.join('lib')
 #    config.x = {}
+    if sentry_dsn = Rails.application.secrets.sentry_dsn
+      Raven.configure do |config|
+        config.dsn = sentry_dsn
+      end
+    end
   end
 end
 
 db_conf = YAML::load(File.open(File.join("#{Rails.root}/config/database.yml")))
 bacula_db_conf = YAML::load(File.open(File.join("#{Rails.root}/config/database_bacula.yml")))
 
 ARCHIVING_CONF = db_conf[Rails.env]
 BACULA_CONF = bacula_db_conf[Rails.env]
 
 Archiving::Application.config.active_record.table_name_prefix = "#{ARCHIVING_CONF['database']}."
diff --git a/config/secrets.yml.sample b/config/secrets.yml.sample
index a49301d..7b50621 100644
--- a/config/secrets.yml.sample
+++ b/config/secrets.yml.sample
@@ -1,28 +1,30 @@
 # Be sure to restart your server when you modify this file.
 
 # Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
 
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 # You can use `rake secret` to generate a secure secret key.
 
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 
 development:
   secret_key_base: something
   oauth2_vima_client_id: something
   oauth2_vima_secret: something
+  sentry_dsn: the_https_key_for_sentry
   salt: something
 
 test:
   secret_key_base: 2308355d12d4fdb078d943719229f3fb3f07ade7a2bad418cce6f69d7b741aedeb7f84627fcfddc4eca9ae9812d9c6dc915ab50df39d42c2d2dc3eb0be844306
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
   secret_key_base: something
   oauth2_vima_client_id: something
   oauth2_vima_secret: something
+  sentry_dsn: the_https_key_for_sentry
   salt: something