Edit Menu Token does not work

Steps to reproduce
1) Create a tokenized menu item.
2) Edit tokenized menu item.
3) try edit and save.

When I try editing a tokenized menu item e.g. x/[node:nid]/edit
Already checked : use tokens
Issue 1: Select Method : Node from Context. : Gives an Ajax Error : undefined index : node at line 379.
Issue 2 : Submit/Save : Gives a Validation Error : is either invalid or you do not have access to it.

Workarounds (Bad code) :
for Issue 1 : disabled $append condition for additional options. as $type = node was not working.
result : a blank Menu Option Select element is displayed. Ajax error is gone.

for Issue 2(super bad as we never want to disable drupal_valid_path() check): Looks like the token path is failing on the drupal_valid_path() check where the path sent is x/[node:nid]/edit which returns nothing and hence the error, disabling this check allows successful save and the menu item works as expected.

Please Advise.

Help is very much appreciated.