Clean up scripts instructions and tagged one more Java file for potential NPE