better error handling and fixture fix