Added More Error Checking to the Common Framework