Merge "Added trap for invalid key frame"