2 files changed, 11 insertions, 4 deletions
diff --git a/src/kernel/KernelKit/Semaphore.h b/src/kernel/KernelKit/Semaphore.h
index bb6b9ba9..4dc9a454 100644
--- a/src/kernel/KernelKit/Semaphore.h
+++ b/src/kernel/KernelKit/Semaphore.h
@@ -29,6 +29,7 @@ using SemaphoreArr = UInt64[kSemaphoreCount];
 
 /// @brief Checks if the semaphore is valid.
 inline bool rtl_sem_is_valid(const SemaphoreArr& sem, const UInt64& owner = 0) {
+  if (!sem) return false;
   return sem[kSemaphoreOwnerIndex] == owner && sem[kSemaphoreCountIndex] > 0;
 }
 
@@ -36,6 +37,8 @@ inline bool rtl_sem_is_valid(const SemaphoreArr& sem, const UInt64& owner = 0) {
 /// @param sem
 /// @return
 inline bool rtl_sem_release(SemaphoreArr& sem) {
+  if (!sem) return false;
+
   sem[kSemaphoreOwnerIndex] = 0;
   sem[kSemaphoreCountIndex] = 0;
 
@@ -47,6 +50,8 @@ inline bool rtl_sem_release(SemaphoreArr& sem) {
 /// @param owner the owner to set, could be anything identifitable.
 /// @return
 inline bool rtl_sem_acquire(SemaphoreArr& sem, const UInt64& owner) {
+  if (!sem) return false;
+
   if (!owner) {
     err_global_get() = kErrorInvalidData;
     return false;  // Invalid owner, return false and set KPC.
@@ -65,6 +70,8 @@ inline bool rtl_sem_acquire(SemaphoreArr& sem, const UInt64& owner) {
 /// @return
 inline bool rtl_sem_wait(SemaphoreArr& sem, const UInt64& owner, const UInt64& timeout,
                          bool& condition) {
+  if (!sem) return false;
+
   if (!rtl_sem_is_valid(sem, owner)) {
     return false;
   }
diff --git a/src/kernel/KernelKit/User.h b/src/kernel/KernelKit/User.h
index bae51180..6711bce7 100644
--- a/src/kernel/KernelKit/User.h
+++ b/src/kernel/KernelKit/User.h
@@ -42,16 +42,16 @@ enum struct UserRingKind : Int32 {
   kRingCount     = 3,
 };
 
-using UserPublicKey     = Char*;
-using UserPublicKeyType = Char;
+using UserPublicKey     = Char8*;
+using UserPublicKeyType = Char8;
 
 /// @brief System User class.
 class User final {
  public:
   User() = delete;
 
-  User(const Int32& sel, const Char* username);
-  User(const UserRingKind& kind, const Char* username);
+  User(const Int32& sel, const UserPublicKeyType* username);
+  User(const UserRingKind& kind, const UserPublicKeyType* username);
 
   ~User();