Put some logic checks back in.

Signed-off-by: Anna Wojtowicz <wojtowicza@ornl.gov>
Merge branch 'dynamic_moose_files' of https://github.com/eclipse/ice into dynamic_moose_files
Put some logic checks back in.

Signed-off-by: Anna Wojtowicz <wojtowicza@ornl.gov>