Add some extra error handling and basic specs.