LPS-37721 Do it in a finally block
LPS-37239 missing required