Initial exceptions fixed