diff --git a/subprojects/xsts/xsts-analysis/src/main/java/hu/bme/mit/theta/xsts/analysis/config/XstsConfigBuilder.java b/subprojects/xsts/xsts-analysis/src/main/java/hu/bme/mit/theta/xsts/analysis/config/XstsConfigBuilder.java
index 0235649daf..c03c4739fc 100644
--- a/subprojects/xsts/xsts-analysis/src/main/java/hu/bme/mit/theta/xsts/analysis/config/XstsConfigBuilder.java
+++ b/subprojects/xsts/xsts-analysis/src/main/java/hu/bme/mit/theta/xsts/analysis/config/XstsConfigBuilder.java
@@ -375,6 +375,9 @@ public class ExplStrategy extends BuilderStrategy<ExplState, ExplPrec> {
 
 		public ExplStrategy(XSTS xsts) {
 			super(xsts);
+			if (domain != Domain.EXPL) {
+				throw new UnsupportedOperationException(domain + " does not support EXPL builder strategy");
+			}
 		}
 
 		@Override
@@ -418,6 +421,9 @@ public ExplPrec getInitPrec() {
 	public class PredStrategy extends BuilderStrategy<PredState, PredPrec> {
 		public PredStrategy(XSTS xsts) {
 			super(xsts);
+			if (domain != Domain.PRED_BOOL && domain != Domain.PRED_SPLIT && domain != Domain.PRED_CART) {
+				throw new UnsupportedOperationException(domain + " does not support PRED builder strategy");
+			}
 		}
 
 		@Override
@@ -453,6 +459,10 @@ public class ProdStrategy extends BuilderStrategy<Prod2State<ExplState, PredStat
 
 		public ProdStrategy(XSTS xsts) {
 			super(xsts);
+			if (domain != Domain.EXPL_PRED_BOOL && domain != Domain.EXPL_PRED_SPLIT
+					&& domain != Domain.EXPL_PRED_CART && domain != Domain.EXPL_PRED_COMBINED) {
+				throw new UnsupportedOperationException(domain + " does not support PROD builder strategy");
+			}
 		}
 
 		@Override
diff --git a/subprojects/xsts/xsts-analysis/src/main/kotlin/hu/bme/mit/theta/xsts/analysis/XstsInUnWrappers.kt b/subprojects/xsts/xsts-analysis/src/main/kotlin/hu/bme/mit/theta/xsts/analysis/XstsInUnWrappers.kt
index 7837ec7300..de8401d43e 100644
--- a/subprojects/xsts/xsts-analysis/src/main/kotlin/hu/bme/mit/theta/xsts/analysis/XstsInUnWrappers.kt
+++ b/subprojects/xsts/xsts-analysis/src/main/kotlin/hu/bme/mit/theta/xsts/analysis/XstsInUnWrappers.kt
@@ -34,6 +34,4 @@ fun <S : ExprState> xstsExtractFromState(xstsState: XstsState<S>): S {
 
 val xstsStripPrec: (Prec) -> Prec = { it }
 
-fun <P: Prec> xstsStripPrecFun(p: P): P {
-    return p
-}
\ No newline at end of file
+fun <P: Prec> xstsStripPrecFun(p: P) = p
\ No newline at end of file