Added Die parameter checking

fixes #8103
fixes #8105
@leonidbl91 , after you respond to @skirpichev's suggestion this will be ready to go. Thanks for finishing up the first part.