Remove the basedir exception throwing