Changed Error Handling to be expandable.