Don't always return 'true', and re-indent the catch clause