Adding default handler

Change-Id: I5e53636126defcfa4e65e0a5f559ef75afb4d17f