FACES-1757 Parameters got lost during redirect
FACES-1757 Parameters got lost during redirect (added null check and SF)