diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/License.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/License.kt
index 3f5f1307..8d3cf0ba 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/License.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/License.kt
@@ -45,7 +45,7 @@ class License(license: CMsgClientLicenseList.License) {
     /**
      * Gets the payment method used when the license was created.
      */
-    val paymentMethod: EPaymentMethod? = EPaymentMethod.from(license.paymentMethod)
+    val paymentMethod: EPaymentMethod = EPaymentMethod.from(license.paymentMethod) ?: EPaymentMethod.None
 
     /**
      * Gets the license flags.
@@ -60,7 +60,7 @@ class License(license: CMsgClientLicenseList.License) {
     /**
      * Gets the type of the license.
      */
-    val licenseType: ELicenseType? = ELicenseType.from(license.licenseType)
+    val licenseType: ELicenseType = ELicenseType.from(license.licenseType) ?: ELicenseType.NoLicense
 
     /**
      * Gets the territory code of the license.
diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/PersonaStateCallback.kt b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/PersonaStateCallback.kt
index 9f863c26..09cad511 100644
--- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/PersonaStateCallback.kt
+++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamfriends/callback/PersonaStateCallback.kt
@@ -33,7 +33,7 @@ class PersonaStateCallback(
     /**
      * Gets the state.
      */
-    val state: EPersonaState? = EPersonaState.from(friend.personaState)
+    val state: EPersonaState = EPersonaState.from(friend.personaState) ?: EPersonaState.Offline
 
     /**
      * Gets the state flags.