Better checks for error conditions.