Multiple changes, a try except to try and catch all so it does not die
Fixes