Trebuchet: Fix NPE

Change-Id: I89c6a233e3480362db004d361914083223f3cb72
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'cm-10.1' into martincz