Fix error in Production - Redirect to null