Fix logic and show proper error
Update configs