diff --git a/src/gb/gprs_bssgp_rim.c b/src/gb/gprs_bssgp_rim.c
index 7094f5f..2096977 100644
--- a/src/gb/gprs_bssgp_rim.c
+++ b/src/gb/gprs_bssgp_rim.c
@@ -405,7 +405,7 @@
 		case BSSGP_RAN_INF_APP_ID_SON:
 		case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 			/* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */
-			return -EINVAL;
+			return -EOPNOTSUPP;
 		default:
 			return -EINVAL;
 		}
@@ -475,7 +475,7 @@
 	case BSSGP_RAN_INF_APP_ID_SON:
 	case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 		/* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */
-		return -EINVAL;
+		return -EOPNOTSUPP;
 	default:
 		return -EINVAL;
 	}
@@ -528,7 +528,7 @@
 		case BSSGP_RAN_INF_APP_ID_SON:
 		case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 			/* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */
-			return -EINVAL;
+			return -EOPNOTSUPP;
 		default:
 			return -EINVAL;
 		}
@@ -547,7 +547,7 @@
 		case BSSGP_RAN_INF_APP_ID_SON:
 		case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 			/* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */
-			return -EINVAL;
+			return -EOPNOTSUPP;
 		default:
 			return -EINVAL;
 		}
@@ -594,7 +594,7 @@
 		case BSSGP_RAN_INF_APP_ID_SON:
 		case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 			/* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */
-			return -EINVAL;
+			return -EOPNOTSUPP;
 		default:
 			return -EINVAL;
 		}
@@ -613,7 +613,7 @@
 		case BSSGP_RAN_INF_APP_ID_SON:
 		case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 			/* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */
-			return -EINVAL;
+			return -EOPNOTSUPP;
 		default:
 			return -EINVAL;
 		}
@@ -810,7 +810,7 @@
 	case BSSGP_RAN_INF_APP_ID_SON:
 	case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 		/* TODO: add parsers for Si3, MBMS, SON, UTRA-SI app containers */
-		return -EINVAL;
+		return -EOPNOTSUPP;
 	default:
 		return -EINVAL;
 	}
@@ -849,7 +849,7 @@
 	case BSSGP_RAN_INF_APP_ID_SON:
 	case BSSGP_RAN_INF_APP_ID_UTRA_SI:
 		/* TODO: add encoders for Si3, MBMS, SON, UTRA-SI app containers */
-		return -EINVAL;
+		return -EOPNOTSUPP;
 	default:
 		return -EINVAL;
 	}