Added error message filtering and client delete