Add a master class + some more try-catching