updated source.  working again.  added exception handling for testing/school