diff --git a/mhcflurry/antigen_presentation/__init__.py b/mhcflurry/antigen_presentation/__init__.py
index 0b544c71ac10883f5ce56a506171a020bfd88b2d..7406a57d6d863243870d0e09b0594a88e5828602 100644
--- a/mhcflurry/antigen_presentation/__init__.py
+++ b/mhcflurry/antigen_presentation/__init__.py
@@ -1,9 +1,10 @@
-from .presentation_model import PresentationModel
+from .presentation_model import PresentationModel, build_presentation_models
 from .percent_rank_transform import PercentRankTransform
 from . import presentation_component_models, decoy_strategies
 
 __all__ = [
     "PresentationModel",
+    "build_presentation_models",
     "PercentRankTransform",
     "presentation_component_models",
     "decoy_strategies",
diff --git a/mhcflurry/antigen_presentation/presentation_component_models/expression.py b/mhcflurry/antigen_presentation/presentation_component_models/expression.py
index 0c4b516ac9fb82b500247dc89413349dff57d54b..22e1abb0d34b38a2e7dd9f270771bb47be8f7e27 100644
--- a/mhcflurry/antigen_presentation/presentation_component_models/expression.py
+++ b/mhcflurry/antigen_presentation/presentation_component_models/expression.py
@@ -25,7 +25,7 @@ class Expression(PresentationComponentModel):
             group in expression_values.columns
             for group in experiment_to_expression_group.values())
 
-        assert_no_null(experiment_to_expression_group)
+        assert_no_null(expression_values)
 
         self.experiment_to_expression_group = experiment_to_expression_group
         self.expression_values = expression_values
diff --git a/mhcflurry/antigen_presentation/presentation_component_models/fixed_affinity_predictions.py b/mhcflurry/antigen_presentation/presentation_component_models/fixed_affinity_predictions.py
index 3a4a29b10e6e638c68cb29bba4361df0aa26abd2..0680dde4abe83d588c9ea24e7941fb934ba8bbe7 100644
--- a/mhcflurry/antigen_presentation/presentation_component_models/fixed_affinity_predictions.py
+++ b/mhcflurry/antigen_presentation/presentation_component_models/fixed_affinity_predictions.py
@@ -16,6 +16,9 @@ class FixedAffinityPredictions(PresentationComponentModel):
             - "value", "percentile_rank" (IC50 and percent rank)
             - peptide (string)
             - allele (string)
+
+    name : string
+        Used to name output columns and in debug messages
     """
 
     def __init__(