Fixed No Throw for Bad Id
Merge remote-tracking branch 'origin/Dev'