Minor adjustments (error handling).