Take care of null references.
Implemented default resolvers for figure and video URL's.