Better validation of arguments