Supplying a faulty enrollment token results in an http 500 instead of a 400

Supplying a faulty enrollment token results in an http 500 instead of a 400 #517