diff --git a/docs/team.txt b/docs/team.txt
index bc243d6d9..eca7c93a4 100644
--- a/docs/team.txt
+++ b/docs/team.txt
@@ -24,6 +24,7 @@ We're a group of people participating in the yearly repeating password cracking
 | CracktheCon         | Cyphercon, Milwaukee       | 2019 | 1st    |
 | Crack Me If You Can | DEF CON, Las Vegas         | 2019 | 1st    |
 | Crack Me If You Can | DEF CON, Remote            | 2020 | 1st    |
+| Crack Me If You Can | DEF CON, Las Vegas         | 2021 | 1st    |
 
 * Special recognition for team hashcat goes to:
 
diff --git a/src/main.c b/src/main.c
index 04844e2f2..2a2b680c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1173,6 +1173,8 @@ int main (int argc, char **argv)
 
   if (user_options_init (hashcat_ctx) == -1)
   {
+    hashcat_destroy (hashcat_ctx);
+
     hcfree (hashcat_ctx);
 
     return -1;
@@ -1182,6 +1184,10 @@ int main (int argc, char **argv)
 
   if (user_options_getopt (hashcat_ctx, argc, argv) == -1)
   {
+    user_options_destroy (hashcat_ctx);
+
+    hashcat_destroy (hashcat_ctx);
+
     hcfree (hashcat_ctx);
 
     return -1;
@@ -1189,6 +1195,10 @@ int main (int argc, char **argv)
 
   if (user_options_sanity (hashcat_ctx) == -1)
   {
+    user_options_destroy (hashcat_ctx);
+
+    hashcat_destroy (hashcat_ctx);
+
     hcfree (hashcat_ctx);
 
     return -1;
@@ -1213,6 +1223,10 @@ int main (int argc, char **argv)
   {
     printf ("%s\n", VERSION_TAG);
 
+    user_options_destroy (hashcat_ctx);
+
+    hashcat_destroy (hashcat_ctx);
+
     hcfree (hashcat_ctx);
 
     return 0;