Changed exit to return