Fix Controller - try and catch