diff --git a/backend/internal/ktmtrainbot/backgroundbookingjob.go b/backend/internal/ktmtrainbot/backgroundbookingjob.go
index 18f7f03..2d9621d 100644
--- a/backend/internal/ktmtrainbot/backgroundbookingjob.go
+++ b/backend/internal/ktmtrainbot/backgroundbookingjob.go
@@ -268,8 +268,14 @@ func (env *Env) startBooking(job *Booking, username string, password string, cre
 
 	for !passthroughLaggingPage {
 
-		filledPassengerDetailContext, filledPassengerDetails := context.WithTimeout(context.Background(), 15*time.Second)
+		filledPassengerDetailContext, filledPassengerDetails := context.WithTimeout(context.Background(), 30*time.Second)
 		go func() {
+			defer func() {
+				if r := recover(); r != nil {
+					log.Println("Recovering from fillPassengerDetails panic...")
+				}
+			}()
+
 			page = fillPassengerDetails(page, name, gender, passport, passportExpiry, contact)
 			log.Println("Passenger details filled.")
 			filledPassengerDetails()