Added Die parameter checking

Fixed issues : #8103 #8105
trailing whitespace