Removed quick calls / added empty value check

Changed quick calls and added empty value check