Always check if activeQuery is null before using it (#3586)

Always check if activeQuery is null before using it (#3586) #1562