Issue #48 removing unnecessary exception. Fixing errors.