diff --git a/RELEASE/scripts/autoscend/auto_choice_adv.ash b/RELEASE/scripts/autoscend/auto_choice_adv.ash
index 55315af63..9bb72a22c 100644
--- a/RELEASE/scripts/autoscend/auto_choice_adv.ash
+++ b/RELEASE/scripts/autoscend/auto_choice_adv.ash
@@ -319,8 +319,8 @@ boolean auto_run_choice(int choice, string page)
 		case 605: // Welcome to the Great Overlook Lodge (Twin Peak Part 2)
 			run_choice(1); // always advance to next option via choice 1
 			break;
-		case 606: // Lost in the Great Overlook
-			if(in_bhy())
+		case 606: // Lost in the Great Overlook Lodge
+			if(in_bhy() || in_glover() && item_amount($item[Jar Of Oil]) == 0)
 			{
 				// we can't make an oil jar to solve the quest, just adventure until the hotel is burned down
 				run_choice(6); // and flee the music NC
diff --git a/RELEASE/scripts/autoscend/quests/level_09.ash b/RELEASE/scripts/autoscend/quests/level_09.ash
index e37048b8e..2e68d4bef 100644
--- a/RELEASE/scripts/autoscend/quests/level_09.ash
+++ b/RELEASE/scripts/autoscend/quests/level_09.ash
@@ -899,14 +899,22 @@ boolean L9_oilPeak()
 		{
 			if(in_glover())
 			{
-				if(item_amount($item[Crude Oil Congealer]) < 1 && item_amount($item[G]) > 2)
-				{
-					buy($coinmaster[G-Mart], 1, $item[Crude Oil Congealer]);
-				}
 				if(item_amount($item[Crude Oil Congealer]) > 0)
 				{
 					use(1, $item[Crude Oil Congealer]);
 				}
+				else
+				{
+					if(item_amount($item[G]) > 2)
+					{
+						buy($coinmaster[G-Mart], 1, $item[Crude Oil Congealer]);
+						use(1, $item[Crude Oil Congealer]);
+					}
+					else
+					{
+						return false;
+					}
+				}
 			}
 			else if(auto_is_valid($item[Bubblin' Crude]) && creatable_amount($item[Jar Of Oil]) > 0)
 			{