diff --git a/projects/player/src/app/app.component.ts b/projects/player/src/app/app.component.ts
index 1893dbed9f75191fe7cac8234fcb5cc4e7af0a50..5e903a66d890001c3d38501e4b1fef5858f23ca3 100644
--- a/projects/player/src/app/app.component.ts
+++ b/projects/player/src/app/app.component.ts
@@ -45,12 +45,11 @@ export class AppComponent implements OnInit {
       .subscribe((focused: boolean): void => this.onFocus(focused));
   }
 
-  private initUnit(pages: UnitPage[], unitState: UnitState | undefined): void {
+  private initUnitPages(pages: UnitPage[], unitState: UnitState | undefined): void {
     const storedPages: FormPage[] = unitState?.dataParts?.pages ?
       JSON.parse(unitState.dataParts.pages) : [];
     if (storedPages.length > 0) {
-      if (unitState?.unitStateDataType &&
-        this.metaDataService.verifyUnitStateDataType(unitState.unitStateDataType)) {
+      if (this.metaDataService.verifyUnitStateDataType(unitState?.unitStateDataType)) {
         this.pages = this.addStoredValues(pages, storedPages);
       } else {
         // eslint-disable-next-line no-console
@@ -66,11 +65,10 @@ export class AppComponent implements OnInit {
     // eslint-disable-next-line no-console
     console.log('player: onStart', message);
     const unitDefinition: Unit = message.unitDefinition ? JSON.parse(message.unitDefinition) : {};
-    if (unitDefinition.veronaModuleVersion &&
-      this.metaDataService.verifyUnitDefinitionVersion(unitDefinition.veronaModuleVersion)) {
+    if (this.metaDataService.verifyUnitDefinitionVersion(unitDefinition.veronaModuleVersion)) {
       this.veronaPostService.sessionId = message.sessionId;
       this.playerConfig = message.playerConfig || {};
-      this.initUnit(unitDefinition.pages, message.unitState);
+      this.initUnitPages(unitDefinition.pages, message.unitState);
     } else {
       // eslint-disable-next-line no-console
       console.warn('player: wrong unitDefinitionType');
diff --git a/projects/player/src/app/services/meta-data.service.ts b/projects/player/src/app/services/meta-data.service.ts
index 8f8801229c8c58efbfb486e508b6b22777a8b2d4..b44237185ef53ac3564df2a288c5b1d4a156f845 100644
--- a/projects/player/src/app/services/meta-data.service.ts
+++ b/projects/player/src/app/services/meta-data.service.ts
@@ -22,11 +22,11 @@ export class MetaDataService {
     };
   }
 
-  verifyUnitDefinitionVersion(unitDefinition: string): boolean {
-    return (this.playerMetadata.supportedUnitDefinitionTypes === unitDefinition);
+  verifyUnitDefinitionVersion(unitDefinition: string | undefined): boolean {
+    return (!!unitDefinition && unitDefinition === this.playerMetadata.supportedUnitDefinitionTypes);
   }
 
-  verifyUnitStateDataType(unitStateDataType: string): boolean {
-    return (this.playerMetadata.supportedUnitStateDataTypes === unitStateDataType);
+  verifyUnitStateDataType(unitStateDataType: string | undefined): boolean {
+    return (!!unitStateDataType && unitStateDataType === this.playerMetadata.supportedUnitStateDataTypes);
   }
 }