Some more testing, some more error handling