Added IntentNotResolveableException.
Minor changes.