Fix the class name

Change-Id: I74e523717ca78983b67aa612161e8f32aaead2d1
Avoid possible resource leaks in case of exception

Change-Id: I58d1b270de2fe1d8ffb1867e5c36ab5ebf332ae0