Wasn't checking for the right error [KFSQA-1061]
Merge remote-tracking branch 'origin/master'