Fixes #81831, a check was missing.
Merge pull request #75 from luisromangz/8.4-SNAPSHOT

Fixes #81831, a check was missing.
Fix for use of variable before initialization.
Merge pull request #76 from luisromangz/8.4-SNAPSHOT

Fix for use of variable before initialization.