Improved check on empty parameters
Added status