Added arguments check