Deleted spaces
Fixes some consistency issues
Reworked exception handling for recreateIndex()
Removed unneeded null check
Merge branch 'master' into nl-postcodes-check