Ensure that finally awaits returned promises

Fix #342