Improve arguments checks
Improve shown errors