Added error messages in case something not found