Fixed NPE bugs
Refactored message methods - Closes #203