New system test and better error handling