]Felix,MJ[ added a try catch so that the system can send out translated error responses
Merge commit '7a19330bcd826cfc8818e857a6481f7a682a849d'