stopped it from throwing exception
Merge origin/master