improved error handling.

Signed-off-by: Johny Jose <johny@playlyfe.com>