Extra error handlers and refactoring to use the new convenience method
from the framework.