Catch exception as references

Change-Id: I0dc7ee7070cbf2e4eb97c6bd619a0818da639fcc