Added the first font, fixed up error handling.

Change-Id: Ibd76fb2628ac35ee81a0483dfa0da7908dfd4372