Added better message handlign when updating/creating new subjects