Moved to try/catch/finally =D