Added additional foolproof checks for CreateAssignment