Change logic for checking secrets exists (#4711)

Change logic for checking secrets exists (#4711) #212