diff --git a/model_service/app.py b/model_service/app.py
index 415642d..3822d87 100644
--- a/model_service/app.py
+++ b/model_service/app.py
@@ -32,8 +32,8 @@ app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('DATABASE_URI', "sqlite:/
 app.config['MINIO_ENDPOINT'] = os.environ['MINIO_ENDPOINT']
 app.config['MINIO_ACCESS_KEY'] = os.environ['MINIO_ACCESS_KEY']
 app.config['MINIO_SECRET_KEY'] = os.environ['MINIO_SECRET_KEY']
-app.config['MINIO_SVM_BUCKET_NAME'] = os.environ['MINIO_SVM_BUCKET_NAME']
-app.config['MINIO_CNN_BUCKET_NAME'] = os.environ['MINIO_CNN_BUCKET_NAME']
+app.config['MINIO_SVM_BUCKET_NAME'] = os.environ.get('MINIO_SVM_BUCKET_NAME', 'svm')
+app.config['MINIO_CNN_BUCKET_NAME'] = os.environ.get('MINIO_CNN_BUCKET_NAME', 'cnn')
 app.config['MINIO_SECURE'] = os.environ.get('MINIO_SECURE', False)
 app.config['MINIO_REGION'] = os.environ.get('MINIO_REGION', None)
 
diff --git a/model_service/views/svm_view.py b/model_service/views/svm_view.py
index 59433dc..8c3447a 100644
--- a/model_service/views/svm_view.py
+++ b/model_service/views/svm_view.py
@@ -61,9 +61,12 @@ class SVMView(FlaskView):
 
         try:
 
-            _, _, _, _, mid_window, mid_step, short_window, short_step, compute_beat \
+            _, _, _, classes, mid_window, mid_step, short_window, short_step, compute_beat \
                 = load_model(temp_model_filename)
 
+            if info['target_class_name'] not in classes:
+                abort(400, f"This model does not have a class named {info['target_class_name']}")
+
             # Because of pyAudiomeme the files already saved, so we just use the file uploader functions
             storage.connection.fput_object(
                 current_app.config['MINIO_SVM_BUCKET_NAME'],