Anishek | #2059 | ability to handle error submissions