Exception Handling added
JavaDoc updated