diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index ff0b95f365..821b3ae65c 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -128,8 +128,8 @@
 		if(href_list["program"])
 			var/prog = href_list["program"]
 			if(prog in (supported_programs + restricted_programs))
-				loadProgram(prog)
-				current_program = prog
+				if(loadProgram(prog))
+					current_program = prog
 
 		else if(href_list["AIoverride"])
 			if(!issilicon(usr))
@@ -294,11 +294,11 @@
 	if(check_delay)
 		if(world.time < (last_change + 25))
 			if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve
-				return
+				return 0
 			for(var/mob/M in range(3,src))
 				M.show_message("\b ERROR. Recalibrating projection apparatus.")
 				last_change = world.time
-				return
+				return 0
 
 	last_change = world.time
 	active = 1
@@ -349,6 +349,8 @@
 
 		update_projections()
 
+	return 1
+
 
 /obj/machinery/computer/HolodeckControl/proc/toggleGravity(var/area/A)
 	if(world.time < (last_gravity_change + 25))