- Changes in few checks
- handling and display of errors

Signed-off-by: Siddhartha Gupta <makerzzz.zzzz@gmail.com>