Further error handling additions.