light error checking

Change-Id: I71535177bb1598a20bd7ca7952feef382d8f590a