Replace todo by throws
Merge remote-tracking branch 'origin/master'