I agree this needs some cleanup/error checking.

Will add it to list.