Catch as references
Cleaned up more warnings.
Merge commit 'refs/pull/304/head' of github.com:znc/znc