More error handling and package tests.