Fixed 'Bug 12439 - Error from resolve command handler '.