- Avoid NPE + provide some mechanism for offline checking (to be tested...)