More error handling + version bump