Add custom errors and its handling