Fixes two javascript error cases Also fixes Bug 49382 Change-Id: I549d313f8bd570f89b2591491df97166dc999afc