Some fixes with regards to exception handling and such