Frameworks: Squashing errors

Change-Id: I30d292104eb414da600f732086044856c9c14757
Signed-off-by: Evan Anderson <evan1124@gmail.com>