Fixed NPE Issue #423