Removed stale require.
Added check that args exist to avoid NPE.