Cleaning up package error handling