minor cleanup for error handling