Added basic security check