Add few checks & error messages.