Fix handling of face loss
Fix error handling
For faster testing