Added File.separator, shouldn't get anymore NPE's