diff --git a/eeschema/net_navigator.cpp b/eeschema/net_navigator.cpp
index 11d623dfff..e19d67df6d 100644
--- a/eeschema/net_navigator.cpp
+++ b/eeschema/net_navigator.cpp
@@ -459,7 +459,8 @@ const SCH_ITEM* SCH_EDIT_FRAME::SelectNextPrevNetNavigatorItem( bool aNext )
 
 void SCH_EDIT_FRAME::SelectNetNavigatorItem( const NET_NAVIGATOR_ITEM_DATA* aSelection )
 {
-    wxCHECK( m_netNavigator && !m_netNavigator->IsFrozen(), /* void */ );
+    wxCHECK( m_netNavigator, /* void */ );
+    wxCHECK( !m_netNavigator->IsFrozen(), /* void */ );
 
     // Maybe in the future we can do something like collapse the tree for an empty selection.
     // For now, leave the tree selection in its current state.
@@ -529,7 +530,8 @@ const SCH_ITEM* SCH_EDIT_FRAME::GetSelectedNetNavigatorItem() const
 
 void SCH_EDIT_FRAME::onNetNavigatorSelection( wxTreeEvent& aEvent )
 {
-    wxCHECK( m_netNavigator && !m_netNavigator->IsFrozen(), /* void */ );
+    wxCHECK( m_netNavigator, /* void */ );
+    wxCHECK( !m_netNavigator->IsFrozen(), /* void */ );
 
     wxTreeItemId id = aEvent.GetItem();
 
@@ -544,14 +546,10 @@ void SCH_EDIT_FRAME::onNetNavigatorSelection( wxTreeEvent& aEvent )
         return;
 
     if( GetCurrentSheet() != itemData->GetSheetPath() )
-    {
-        GetToolManager()->RunAction<SCH_SHEET_PATH*>( SCH_ACTIONS::changeSheet,
-                                                      &itemData->GetSheetPath() );
-    }
+        GetToolManager()->RunAction<SCH_SHEET_PATH*>( SCH_ACTIONS::changeSheet, &itemData->GetSheetPath() );
 
     // Do not focus on item when a sheet tree node is selected.
-    if( m_netNavigator->GetItemParent( id ) != m_netNavigator->GetRootItem()
-            && itemData->GetItem() )
+    if( m_netNavigator->GetItemParent( id ) != m_netNavigator->GetRootItem() && itemData->GetItem() )
     {
         // Make sure we didn't remove the item and/or the screen it resides on before we access it.
         const SCH_ITEM* item = itemData->GetItem();
@@ -575,7 +573,8 @@ void SCH_EDIT_FRAME::onNetNavigatorSelection( wxTreeEvent& aEvent )
 
 void SCH_EDIT_FRAME::onNetNavigatorSelChanging( wxTreeEvent& aEvent )
 {
-    wxCHECK( m_netNavigator && !m_netNavigator->IsFrozen(), /* void */ );
+    wxCHECK( m_netNavigator, /* void */ );
+    wxCHECK( !m_netNavigator->IsFrozen(), /* void */ );
 
     aEvent.Skip();
 }
diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp
index 9fd4338421..40a63f5adb 100644
--- a/pcbnew/pad.cpp
+++ b/pcbnew/pad.cpp
@@ -573,8 +573,12 @@ std::shared_ptr<SHAPE> PAD::GetEffectiveShape( PCB_LAYER_ID aLayer, FLASHING fla
 
     aLayer = Padstack().EffectiveLayerFor( aLayer );
 
-    wxCHECK_MSG( m_effectiveShapes.contains( aLayer ) && m_effectiveShapes.at( aLayer ), nullptr,
-                 wxT( "Null shape in PAD::GetEffectiveShape!" ) );
+    wxCHECK_MSG( m_effectiveShapes.contains( aLayer ), nullptr,
+                 wxString::Format( wxT( "Missing shape in PAD::GetEffectiveShape for layer %s." ),
+                                   magic_enum::enum_name( aLayer ) ) );
+    wxCHECK_MSG( m_effectiveShapes.at( aLayer ), nullptr,
+                 wxString::Format( wxT( "Null shape in PAD::GetEffectiveShape for layer %s." ),
+                                   magic_enum::enum_name( aLayer ) ) );
 
     return m_effectiveShapes[aLayer];
 }
diff --git a/pcbnew/padstack.cpp b/pcbnew/padstack.cpp
index 5b8f596c4f..2432fbbfcf 100644
--- a/pcbnew/padstack.cpp
+++ b/pcbnew/padstack.cpp
@@ -1051,8 +1051,8 @@ const PADSTACK::COPPER_LAYER_PROPS& PADSTACK::CopperLayer( PCB_LAYER_ID aLayer )
     auto it = m_copperProps.find( layer );
 
     wxCHECK_MSG( it != m_copperProps.end(), m_copperProps.at( ALL_LAYERS ),
-        "Attempt to retrieve layer " + std::string( magic_enum::enum_name( layer ) ) + " from a "
-        "padstack that does not contain it" );
+                 wxString::Format( wxT( "Attempt to retrieve layer %d from a padstack that does not contain it" ),
+                                   layer ) );
 
     return it->second;
 }