Change logic for checking secrets exists

Change logic for checking secrets exists #3888