Couple fixes for better error handling with paramaters