Added fix for the NPE with redirectURL