Extra error handling for direct call