Updated the modelling code to handle exceptions better and with improved docstrings

Can we check that the model continues to run as expected??