Better logging, don't die if js_dir doesn't exist
Merge commit '8f4c743'