Fixed 3 issues

Fixed #34
Fixed #35
Fixed empty Message Store notice