Merge branch 'development'
Merge branch 'master' into development
Added error-checking

Not all facts exist on every machine.