Fix for Issue 11036
Fix for #11036, updated with comments of @Stof
Fix for #11036, updated with comments of @Stof in the issue
removed param comment from issue #11036
Improved Exception Message
implemented feedback of @Stof, @stloyd and @Tobion