diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 941f46cec12..f4962da8cfe 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(chem_master_containers, list( /// Insert new beaker and/or eject the inserted one /obj/machinery/chem_master/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) - if(!user?.transferItemToLoc(new_beaker, src)) + if(new_beaker && user && !user.transferItemToLoc(new_beaker, src)) return FALSE if(beaker) try_put_in_hand(beaker, user)