Moved fatal error message to a separate function to hide the ugliness
Merge remote-tracking branch 'origin/make-install' into make-install