initial additional support for error handling.