Add some validations to avoid notices detected on server 11.130
Merge pull request #1336 from julceslauhub/master

Add some validations to avoid notices detected on server 11.130