Added Die parameter checking

fixes #8103
fixes #8105
This function is covered by tests?