Merge pull request #694 from godarklight/avoid-nres

Avoid some NRE's in the logs.
Merge pull request #695 from godarklight/improve-ntp-messages

Improve ntp messages
Implement issue #126, Slight fix to handling the time skew message.