Adding back in relative path
Fixing NPE