Changes for https://github.com/forcedotcom/phoenix/issues/440

Hi James,
    Can you please review and let me know if the changes done the two files are sufficient for a closure on 440.

Regards
Ravi