Assorted fixes

Including:

 - More verbose in the exception from #1491
 - Adding more localization keys
 - Removing an unused factory pattern
 - Fixes to a used factory pattern