More exception handling and other misc. :trident: