Added checks for illegal arguments

Change-Id: Ib386c33b7e2cab12cabbb9dc023d54df05472960
4 files changed