Fix NPE when trying to repair a custom tool.

Signed-off-by: Mike Howe <mike@mcsnetworks.com>