LOW: NPE protection when connector has been removed + fix