Added parameter check on calculation calls