diff --git a/src/mms/iso_common/iso_connection_parameters.c b/src/mms/iso_common/iso_connection_parameters.c
index ed9cd30e..188119e4 100644
--- a/src/mms/iso_common/iso_connection_parameters.c
+++ b/src/mms/iso_common/iso_connection_parameters.c
@@ -106,6 +106,7 @@ IsoApplicationReference_getApTitle(const IsoApplicationReference* self)
 {
     if (self == NULL)
         return NULL;
+
     return &(self->apTitle);
 }
 
@@ -113,7 +114,7 @@ LIB61850_API int
 ItuObjectIdentifier_getArcCount(ItuObjectIdentifier* self)
 {
     if (self == NULL)
-        return NULL;
+        return 0;
 
     return self->arcCount;
 }