Improve except clause and comments [MJ-940]