Merge "Make sure to return false for empty classpath"