Added check for catch-me being filled in.