Better error handling and spaces -> +s.