[Matahari] [PATCH] Shell: Make method calls more robust