Improving Data-Managment and Exceptions