Apps: Added sanity check