Changed commen to exception