Add missing checks
Merge pull request #1235 from andrerod/dev

Add missing checks