Issue #2233507 by JeebsUK: Fixed error in Add handler form when a single bundle does not have the same name as the entity type.