change to priority based error handing
Merge remote-tracking branch 'origin/master'