Fix NPE for connection messages and savedInstance