diff --git a/applications/main/infrared/infrared_error_code.h b/applications/main/infrared/infrared_error_code.h
index 2af06bea12..841721b176 100644
--- a/applications/main/infrared/infrared_error_code.h
+++ b/applications/main/infrared/infrared_error_code.h
@@ -37,9 +37,9 @@ typedef enum {
 #define INFRARED_ERROR_CODE_MASK  (0xFFFFFF00)
 #define INFRARED_ERROR_INDEX_MASK (0x000000FF)
 
-#define INFRARED_ERROR_GET_CODE(error)        (error & INFRARED_ERROR_CODE_MASK)
-#define INFRARED_ERROR_GET_INDEX(error)       (error & INFRARED_ERROR_INDEX_MASK)
-#define INFRARED_ERROR_SET_INDEX(code, index) (code |= (index & INFRARED_ERROR_INDEX_MASK))
+#define INFRARED_ERROR_GET_CODE(error)        ((error) & INFRARED_ERROR_CODE_MASK)
+#define INFRARED_ERROR_GET_INDEX(error)       ((error) & INFRARED_ERROR_INDEX_MASK)
+#define INFRARED_ERROR_SET_INDEX(code, index) ((code) |= ((index) & INFRARED_ERROR_INDEX_MASK))
 
 #define INFRARED_ERROR_PRESENT(error)          (INFRARED_ERROR_GET_CODE(error) != InfraredErrorCodeNone)
-#define INFRARED_ERROR_CHECK(error, test_code) (INFRARED_ERROR_GET_CODE(error) == test_code)
+#define INFRARED_ERROR_CHECK(error, test_code) (INFRARED_ERROR_GET_CODE(error) == (test_code))
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.c b/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.c
index 810242fbc6..6ceb4bce02 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.c
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.c
@@ -1,6 +1,6 @@
 #include "iso14443_3a_render.h"
 
-void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* const data, size_t size) {
+void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* data, size_t size) {
     for(size_t i = 0; i < size; i++) {
         furi_string_cat_printf(str, " %02X", data[i]);
     }
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.h b/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.h
index 34e347aa35..b815155663 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.h
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.h
@@ -11,7 +11,7 @@ void nfc_render_iso14443_3a_info(
 
 void nfc_render_iso14443_tech_type(const Iso14443_3aData* data, FuriString* str);
 
-void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* const data, size_t size);
+void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* data, size_t size);
 
 void nfc_render_iso14443_3a_brief(const Iso14443_3aData* data, FuriString* str);
 
diff --git a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
index c4ad67ff8b..ef83d19427 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
@@ -10,22 +10,29 @@ static void nfc_render_mf_ultralight_pages_count(const MfUltralightData* data, F
 }
 
 void nfc_render_mf_ultralight_pwd_pack(const MfUltralightData* data, FuriString* str) {
+    MfUltralightConfigPages* config;
+
     bool all_pages = mf_ultralight_is_all_data_read(data);
-    if(all_pages) {
+    bool has_config = mf_ultralight_get_config_page(data, &config);
+
+    if(!has_config) {
+        furi_string_cat_printf(str, "\e#Already Unlocked!");
+    } else if(all_pages) {
         furi_string_cat_printf(str, "\e#All Pages Are Unlocked!");
     } else {
         furi_string_cat_printf(str, "\e#Some Pages Are Locked!");
     }
 
-    MfUltralightConfigPages* config;
-    mf_ultralight_get_config_page(data, &config);
+    if(has_config) {
+        furi_string_cat_printf(str, "\nPassword: ");
+        nfc_render_iso14443_3a_format_bytes(
+            str, config->password.data, MF_ULTRALIGHT_AUTH_PASSWORD_SIZE);
 
-    furi_string_cat_printf(str, "\nPassword: ");
-    nfc_render_iso14443_3a_format_bytes(
-        str, config->password.data, MF_ULTRALIGHT_AUTH_PASSWORD_SIZE);
-
-    furi_string_cat_printf(str, "\nPACK: ");
-    nfc_render_iso14443_3a_format_bytes(str, config->pack.data, MF_ULTRALIGHT_AUTH_PACK_SIZE);
+        furi_string_cat_printf(str, "\nPACK: ");
+        nfc_render_iso14443_3a_format_bytes(str, config->pack.data, MF_ULTRALIGHT_AUTH_PACK_SIZE);
+    } else {
+        furi_string_cat_printf(str, "\nThis card does not support\npassword protection!");
+    }
 
     nfc_render_mf_ultralight_pages_count(data, str);
 }