Perform graceful cleanup on errors instead of just bailing out.
Signed-off-by: NJani Nikula <ext-jani.1.nikula@nokia.com>
Tested-by: NKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@nokia.com>