changed handling exceptions
changed class name for eapi