Changing error returning
Conflarcts