Added some missing validation
Merge pull request #15 from ST-DDT/BUKKIT-5245-v2_validation

Added some missing validation