Improved some exception handling