2 files changed, 8 insertions, 4 deletions

diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp
index 3b7a628e5..f7058c4a7 100644
--- a/src/input_common/helpers/joycon_protocol/nfc.cpp
+++ b/src/input_common/helpers/joycon_protocol/nfc.cpp
@@ -528,9 +528,9 @@ NFCWritePackage NfcProtocol::MakeAmiiboWritePackage(const TagUUID& tag_uuid,
 }
 
 NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> data) const {
-    constexpr u8 PAGE_SIZE = 4;
+    constexpr u8 NFC_PAGE_SIZE = 4;
 
-    if (static_cast<std::size_t>(page * PAGE_SIZE) + size >= data.size()) {
+    if (static_cast<std::size_t>(page * NFC_PAGE_SIZE) + size >= data.size()) {
         return {};
     }
 
@@ -539,7 +539,7 @@ NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8>
         .data_size = size,
         .data = {},
     };
-    std::memcpy(chunk.data.data(), data.data() + (page * PAGE_SIZE), size);
+    std::memcpy(chunk.data.data(), data.data() + (page * NFC_PAGE_SIZE), size);
     return chunk;
 }
 
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index c336be707..427afd5fc 100644
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -63,8 +63,12 @@ void BufferCache<P>::RunGarbageCollector() {
 
 template <class P>
 void BufferCache<P>::TickFrame() {
-    // Calculate hits and shots and move hit bits to the right
+    // Homebrew console apps don't create or bind any channels, so this will be nullptr.
+    if (!channel_state) {
+        return;
+    }
 
+    // Calculate hits and shots and move hit bits to the right
     const u32 hits = std::reduce(channel_state->uniform_cache_hits.begin(),
                                  channel_state->uniform_cache_hits.end());
     const u32 shots = std::reduce(channel_state->uniform_cache_shots.begin(),