diff --git a/functions/modules/rocketeer.js b/functions/modules/rocketeer.js
index 1402985..87c1c7f 100644
--- a/functions/modules/rocketeer.js
+++ b/functions/modules/rocketeer.js
@@ -57,6 +57,9 @@ async function getExistingRocketeer( id, network='mainnet' ) {
 // ///////////////////////////////
 async function generateRocketeer( id, network='mainnet' ) {
 
+    // Put dibs on the Rocketeer ID to make race conditions more unlikely
+    await db.collection( `${ network }Rocketeers` ).doc( id ).set( {}, { merge: true } )
+
     // The base object of a new Rocketeer
     const rocketeer = {
         name: `${ name.first() } ${ name.middle() } ${ name.last() } of ${ id % 42 == 0 ? 'the Towel' : pickRandomArrayEntry( heavenlyBodies ) }`,
@@ -118,7 +121,7 @@ async function generateRocketeer( id, network='mainnet' ) {
     rocketeer.description = `${ rocketeer.name } is a proud member of the ${ rocketeer.attributes.find( ( { trait_type } ) => trait_type == 'patch' ).value } guild.`
 
     // Save new Rocketeer
-    await db.collection( `${ network }Rocketeers` ).doc( id ).set( rocketeer )
+    await db.collection( `${ network }Rocketeers` ).doc( id ).set( rocketeer, { merge: true } )
 
     return rocketeer
 
diff --git a/viewer/src/App.js b/viewer/src/App.js
index 26a6fbe..6c676e0 100644
--- a/viewer/src/App.js
+++ b/viewer/src/App.js
@@ -86,7 +86,7 @@ function App() {
     <p>{ rocketeer.description || "This is a generic Rocketeer without a description. That should only happen during testing. Contact us on Discord if you see this." }</p>
 
     <ul id="traits">
-      { rocketeer.attributes.map( ( { trait_type, value } ) => <li key={ trait_type }><span>{ trait_type }</span><span>{ value }</span></li> ) }
+      { rocketeer.attributes?.map( ( { trait_type, value } ) => <li key={ trait_type }><span>{ trait_type }</span><span>{ value }</span></li> ) }
     </ul>
 
     <div>