Added some missing validation

Some methods are not properly validating their arguments.