Merge "Prevent NPE in not attached Clock"