Added a try/finally so it always passes the data on