Fixed Matcher. Added some error handling for casting.