Small fix (rescue a exception)