Improve exception handling
Start Javadocing...