Added same delegate checking logic to other places because apparently i derped harder then i thought i did.