Remove unnecessary try/catches from API extensions

Change-Id: Ifec845280f2f2abf545271a17c6b245d461a4e7b