Safety checks

by Alex Iacobus