Complete javadoc and don't throw NPE