Stop throwing err
Merge branch 'stopthrowing'