CFY-1295 work on exception handling and error defaults