Added missing arguments check