diff --git a/lib/Screens/circuit.dart b/lib/Screens/circuit.dart
index 9f751f9..d04ccd2 100644
--- a/lib/Screens/circuit.dart
+++ b/lib/Screens/circuit.dart
@@ -147,7 +147,7 @@ class CircuitScreen extends StatelessWidget {
                                 ),
                               ),
                             ),
-                            snapshot.data!['links'].isNotEmpty
+                            snapshot.data!['links'] != null
                                 ? Padding(
                                     padding: const EdgeInsets.symmetric(
                                       vertical: 3,
@@ -238,7 +238,7 @@ class CircuitScreen extends StatelessWidget {
                                 ),
                               ),
                             ),
-                            snapshot.data!['raceResults'].isNotEmpty
+                            snapshot.data!['raceResults'] != null
                                 ? Padding(
                                     padding: const EdgeInsets.all(
                                       10,
diff --git a/lib/Screens/grand_prix_running_details.dart b/lib/Screens/grand_prix_running_details.dart
index ef7b313..a625158 100644
--- a/lib/Screens/grand_prix_running_details.dart
+++ b/lib/Screens/grand_prix_running_details.dart
@@ -454,7 +454,7 @@ class GrandPrixRunningScreen extends StatelessWidget {
                           ),
                           onTap: () => launchUrl(
                             Uri.parse(
-                              "https://raceprogramme.formula1.com/#/catalogue",
+                              "https://web.formula1rp.com/",
                             ),
                           ),
                         ),