diff --git a/api/server.py b/api/server.py
index 692f551..9bed6d6 100644
--- a/api/server.py
+++ b/api/server.py
@@ -1,69 +1,73 @@
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+import click
 
 from flask import Flask, g, request
 
 from swh.core import config
 from swh.storage.objstorage import ObjStorage
 from swh.storage.api.common import (BytesRequest, decode_request,
                                     error_handler,
                                     encode_data_server as encode_data)
 
 DEFAULT_CONFIG = {
     'storage_base': ('str', '/tmp/swh-storage/objects/'),
     'storage_depth': ('int', 3)
 }
 
 app = Flask(__name__)
 app.request_class = BytesRequest
 
 
 @app.errorhandler(Exception)
 def my_error_handler(exception):
     return error_handler(exception, encode_data)
 
 
 @app.before_request
 def before_request():
     g.objstorage = ObjStorage(app.config['storage_base'],
                               app.config['storage_depth'])
 
 
 @app.route('/')
 def index():
     return "Helloworld!"
 
 
 @app.route('/content')
 def content():
     return str(list(g.storage))
 
 
 @app.route('/content/add', methods=['POST'])
 def add_bytes():
     return encode_data(g.objstorage.add_bytes(**decode_request(request)))
 
 
 @app.route('/content/get', methods=['POST'])
 def get_bytes():
     return encode_data(g.objstorage.get_bytes(**decode_request(request)))
 
 
 @app.route('/content/check', methods=['POST'])
 def check():
-    # TODO verify that an error on this content will be properly intercepted
-    # by @app.errorhandler and the answer will be sent to client.
     return encode_data(g.objstorage.check(**decode_request(request)))
 
 
-if __name__ == '__main__':
-    import sys
+@click.command()
+@click.argument('Config-path', required=1)
+@click.option('--host', default='0.0.0.0', help="Host to run the server")
+@click.option('--port', default=5000, help="Server's port")
+@click.option('--debug/--nodebug', default=True,
+              help="Indicates if the server should run in debug mode")
+def launch(config_path, host, port, debug):
+    app.config.update(config.read(config_path, DEFAULT_CONFIG))
+    app.run(host, port=int(port), debug=bool(debug))
 
-    app.config.update(config.read(sys.argv[1], DEFAULT_CONFIG))
 
-    host = sys.argv[2] if len(sys.argv) >= 3 else '0.0.0.0'
-    port = int(sys.argv[3]) if len(sys.argv) >= 4 else 5000
-    app.run(host, port=port, debug=True)
+if __name__ == '__main__':
+    launch()