Might need to bring the try-catch back - NB: it was not done consistently across the board though