Minor style updates
Issue #259: Preventing SRWebSocket crash
Merge remote-tracking branch 'origin/develop' into issues/250-null-relationships