Add strlen check to fix PP additional hang