Some more argument checks added