Slight update to message text + handle NPE