Handle none Frames.
Adding javadocs and minor clean ups after PR feedback.